about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2018-04-02 13:20:06 +0200
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2018-04-13 23:28:03 +0200
commit812656dc9543a16c27cf0a5aad1171ea3cc01a0d (patch)
treeb4e26e883a801b83584cb1a6b2278728a7efdacd /src/tools
parent9c2bfcbea2d7fff10e608b495d76f24f441999b9 (diff)
downloadrust-812656dc9543a16c27cf0a5aad1171ea3cc01a0d.tar.gz
rust-812656dc9543a16c27cf0a5aad1171ea3cc01a0d.zip
Rename must-compile-successfully into compile-pass
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/compiletest/src/header.rs14
-rw-r--r--src/tools/compiletest/src/runtest.rs4
2 files changed, 9 insertions, 9 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index 94a6353ad24..3795704466a 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -223,7 +223,7 @@ pub struct TestProps {
     // arguments. (In particular, it propagates to the aux-builds.)
     pub incremental_dir: Option<PathBuf>,
     // Specifies that a test must actually compile without errors.
-    pub must_compile_successfully: bool,
+    pub compile_pass: bool,
     // rustdoc will test the output of the `--test` option
     pub check_test_line_numbers_match: bool,
     // The test must be compiled and run successfully. Only used in UI tests for now.
@@ -257,7 +257,7 @@ impl TestProps {
             pretty_compare_only: false,
             forbid_output: vec![],
             incremental_dir: None,
-            must_compile_successfully: false,
+            compile_pass: false,
             check_test_line_numbers_match: false,
             run_pass: false,
             disable_ui_testing_normalization: false,
@@ -375,10 +375,10 @@ impl TestProps {
                 self.run_pass = config.parse_run_pass(ln);
             }
 
-            if !self.must_compile_successfully {
+            if !self.compile_pass {
                 // run-pass implies must_compile_sucessfully
-                self.must_compile_successfully =
-                    config.parse_must_compile_successfully(ln) || self.run_pass;
+                self.compile_pass =
+                    config.parse_compile_pass(ln) || self.run_pass;
             }
 
             if !self.disable_ui_testing_normalization {
@@ -508,8 +508,8 @@ impl Config {
         }
     }
 
-    fn parse_must_compile_successfully(&self, line: &str) -> bool {
-        self.parse_name_directive(line, "must-compile-successfully")
+    fn parse_compile_pass(&self, line: &str) -> bool {
+        self.parse_name_directive(line, "compile-pass")
     }
 
     fn parse_disable_ui_testing_normalization(&self, line: &str) -> bool {
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 0081c0ae69d..db0ac927904 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -232,7 +232,7 @@ impl<'test> TestCx<'test> {
     }
 
     fn check_if_test_should_compile(&self, proc_res: &ProcRes) {
-        if self.props.must_compile_successfully {
+        if self.props.compile_pass {
             if !proc_res.status.success() {
                 self.fatal_proc_rec("test compilation failed although it shouldn't!", proc_res);
             }
@@ -1100,7 +1100,7 @@ impl<'test> TestCx<'test> {
 
     fn check_error_patterns(&self, output_to_check: &str, proc_res: &ProcRes) {
         if self.props.error_patterns.is_empty() {
-            if self.props.must_compile_successfully {
+            if self.props.compile_pass {
                 return;
             } else {
                 self.fatal(&format!(