about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Schneider <github35764891676564198441@oli-obk.de>2018-05-17 16:28:36 +0200
committerOliver Schneider <github35764891676564198441@oli-obk.de>2018-05-17 16:28:36 +0200
commit0ac2fd1ce2917e3e5f1845ff8d319d03181b244b (patch)
treeb28dbfc4cc99f2c3b92cdfd67817c26f68b1c0ef
parent74bfd94ec55b9e26e47e597fbe0ba25cb75063ba (diff)
downloadrust-0ac2fd1ce2917e3e5f1845ff8d319d03181b244b.tar.gz
rust-0ac2fd1ce2917e3e5f1845ff8d319d03181b244b.zip
Update docs and diagnostics
-rw-r--r--src/test/COMPILER_TESTS.md10
-rw-r--r--src/tools/compiletest/src/runtest.rs8
2 files changed, 6 insertions, 12 deletions
diff --git a/src/test/COMPILER_TESTS.md b/src/test/COMPILER_TESTS.md
index 29f1e2e5b78..7dabb1bddea 100644
--- a/src/test/COMPILER_TESTS.md
+++ b/src/test/COMPILER_TESTS.md
@@ -140,13 +140,9 @@ check that the test compiles successfully.
 ### Editing and updating the reference files
 
 If you have changed the compiler's output intentionally, or you are
-making a new test, you can use the script `ui/update-references.sh` to
-update the references. When you run the test framework, it will report
-various errors: in those errors is a command you can use to run the
-`ui/update-references.sh` script, which will then copy over the files
-from the build directory and use them as the new reference. You can
-also just run `ui/update-all-references.sh`. In both cases, you can run
-the script with `--help` to get a help message.
+making a new test, you can pass `--bless` to the command you used to
+run the tests. This will then copy over the files
+from the build directory and use them as the new reference.
 
 ### Normalization
 
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index d54bfa5f918..9e5ae213568 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2596,15 +2596,13 @@ impl<'test> TestCx<'test> {
         }
 
         if errors > 0 {
-            println!("To update references, run this command from build directory:");
+            println!("To update references, rerun the tests and pass the `--bless` flag");
             let relative_path_to_file = self.testpaths
                 .relative_dir
                 .join(self.testpaths.file.file_name().unwrap());
             println!(
-                "{}/update-references.sh '{}' '{}'",
-                self.config.src_base.display(),
-                self.config.build_base.display(),
-                relative_path_to_file.display()
+                "To only update this specific test, also pass `--test-args {}`",
+                relative_path_to_file.display(),
             );
             self.fatal_proc_rec(
                 &format!("{} errors occurred comparing output.", errors),