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

This commit is contained in:
Mazdak Farrokhzad 2019-12-01 13:31:50 +01:00
parent fc5deca214
commit d8b817810f
1 changed files with 6 additions and 2 deletions

View File

@ -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