diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-01 13:31:50 +0100 |
|---|---|---|
| committer | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-21 22:16:00 +0100 |
| commit | d8b817810f5848916adcd2c2a2f573015a3a5f8c (patch) | |
| tree | 993f181dfbd92e80a42ab33fcb4fc60db82265c8 /src | |
| parent | fc5deca2143a448d10a1241a777275e59448c94d (diff) | |
| download | rust-d8b817810f5848916adcd2c2a2f573015a3a5f8c.tar.gz rust-d8b817810f5848916adcd2c2a2f573015a3a5f8c.zip | |
make `--pass check` work with `// run-fail` tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 46cce6394e6..93586060438 100644 --- 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 |