Error if a legacy-style directive is detected in any ui tests

Author: jieyouxu

src/tools/compiletest/src/header.rs

@@ -46,7 +46,8 @@ impl EarlyProps {
 
     pub fn from_reader<R: Read>(config: &Config, testfile: &Path, rdr: R) -> Self {
         let mut props = EarlyProps::default();
-        iter_header(config.mode, testfile, rdr, &mut |_, ln, _| {
+        let mut poisoned = false;
+        iter_header(config.mode, &mut poisoned, testfile, rdr, &mut |_, ln, _| {
             config.push_name_value_directive(ln, directives::AUX_BUILD, &mut props.aux, |r| {
                 r.trim().to_string()
             });
@@ -58,6 +59,12 @@ impl EarlyProps {
             );
             config.parse_and_update_revisions(ln, &mut props.revisions);
         });
+
+        if poisoned {
+            eprintln!("errors encountered during EarlyProps parsing: {}", testfile.display());
+            panic!("errors encountered during EarlyProps parsing");
+        }
+
         return props;
     }
 }
@@ -306,7 +313,9 @@ impl TestProps {
         if !testfile.is_dir() {
             let file = File::open(testfile).unwrap();
 
-            iter_header(self.config.mode, testfile, file, &mut |revision, ln, _| {
+            let mut poisoned = false;
+
+            iter_header(config.mode, &mut poisoned, testfile, file, &mut |revision, ln, _| {
                 if revision.is_some() && revision != cfg {
                     return;
                 }
@@ -505,6 +514,11 @@ impl TestProps {
                     self.llvm_cov_flags.extend(split_flags(&flags));
                 }
             });
+
+            if poisoned {
+                eprintln!("errors encountered during TestProps parsing: {}", testfile.display());
+                panic!("errors encountered during TestProps parsing");
+            }
         }
 
         if self.should_ice {
@@ -630,15 +644,17 @@ pub fn line_directive<'line>(
 
 fn iter_header<R: Read>(
     mode: Mode,
+    poisoned: &mut bool,
     testfile: &Path,
     rdr: R,
     it: &mut dyn FnMut(Option<&str>, &str, usize),
 ) {
-    iter_header_extra(mode, testfile, rdr, &[], it)
+    iter_header_extra(mode, poisoned, testfile, rdr, &[], it)
 }
 
 fn iter_header_extra(
     mode: Mode,
+    poisoned: &mut bool,
     testfile: &Path,
     rdr: impl Read,
     extra_directives: &[&str],
@@ -677,8 +693,20 @@ fn iter_header_extra(
         let ln = ln.trim();
         if ln.starts_with("fn") || ln.starts_with("mod") {
             return;
+
+        // First try to accept `ui_test` style comments
         } else if let Some((lncfg, ln)) = line_directive(comment, ln) {
             it(lncfg, ln, line_number);
+        } else if mode == Mode::Ui && line_directive("//", ln).is_some() {
+            // We have a comment that's *successfully* parsed as an legacy-style directive.
+            // We emit an error here to warn the user.
+            *poisoned = true;
+            eprintln!(
+                "error: detected legacy-style directives in ui test: {}:{}, please use `ui_test`-style directives `//@` instead",
+                testfile.display(),
+                line_number,
+            );
+            return;
         }
     }
 }
@@ -956,8 +984,11 @@ pub fn make_test_description<R: Read>(
         _ => &[],
     };
 
+    let mut local_poisoned = false;
+
     iter_header_extra(
         config.mode,
+        &mut local_poisoned,
         path,
         src,
         extra_directives,
@@ -1006,6 +1037,11 @@ pub fn make_test_description<R: Read>(
         },
     );
 
+    if local_poisoned {
+        eprintln!("errors encountered when trying to make test description: {}", path.display());
+        panic!("errors encountered when trying to make test description");
+    }
+
     // The `should-fail` annotation doesn't apply to pretty tests,
     // since we run the pretty printer across all tests by default.
     // If desired, we could add a `should-fail-pretty` annotation.