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

Centril · Centril · commit 68cce860dffa · 2019-12-14T00:07:53.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -641,8 +641,12 @@ impl TestProps {`
`641`	`641`
`642`	`642`	`pub fn pass_mode(&self, config: &Config) -> Option<PassMode> {`
`643`	`643`	`if !self.ignore_pass {`
`644`		`- if let (mode @ Some(_), Some(_)) = (config.force_pass_mode, self.pass_mode) {`
`645`		`- return mode;`
	`644`	`+ if let (mode @ Some(_), Some(pm_file)) = (config.force_pass_mode, self.pass_mode) {`
	`645`	`+ if pm_file != PassMode::RunFail {`
	`646`	+ // HACK(Centril): See #66929. Ensure that `--pass check`
	`647`	+ // does not cause `// run-fail` tests to fail.
	`648`	`+ return mode;`
	`649`	`+ }`
`646`	`650`	`}`
`647`	`651`	`}`
`648`	`652`	`self.pass_mode`