make --pass check work with // run-fail tests

rust-lang · Dec 13, 2019 · 68cce86 · 68cce86
1 parent 703c82e
commit 68cce86
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
@@ -641,8 +641,12 @@ impl TestProps {
 
     pub fn pass_mode(&self, config: &Config) -> Option<PassMode> {
         if !self.ignore_pass {
-            if let (mode @ Some(_), Some(_)) = (config.force_pass_mode, self.pass_mode) {
-                return mode;
+            if let (mode @ Some(_), Some(pm_file)) = (config.force_pass_mode, self.pass_mode) {
+                if pm_file != PassMode::RunFail {
+                    // HACK(Centril): See #66929. Ensure that `--pass check`
+                    // does not cause `// run-fail` tests to fail.
+                    return mode;
+                }
             }
         }
         self.pass_mode