mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix --pass in compiletest

Browse Source
This commit is contained in:
Jakob Degen 2022-12-04 02:23:21 -08:00
parent 2341517696
commit 01a4898210
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/compiletest/src/header.rs
View File

@ -260,9 +260,9 @@ pub fn from_file(testfile: &Path, cfg: Option<&str>, config: &Config) -> Self {
props.load_from(testfile, cfg, config);
match (props.pass_mode, props.fail_mode) {
(None, None) => props.fail_mode = Some(FailMode::Check),
(Some(_), None) | (None, Some(_)) => {}
(None, None) if config.mode == Mode::Ui => props.fail_mode = Some(FailMode::Check),
(Some(_), Some(_)) => panic!("cannot use a *-fail and *-pass mode together"),
_ => {}
}
props
@ -522,8 +522,8 @@ fn update_pass_mode(&mut self, ln: &str, revision: Option<&str>, config: &Config
}
pub fn pass_mode(&self, config: &Config) -> Option<PassMode> {
if !self.ignore_pass && self.fail_mode.is_none() && config.mode == Mode::Ui {
if let (mode @ Some(_), Some(_)) = (config.force_pass_mode, self.pass_mode) {
if !self.ignore_pass && self.fail_mode.is_none() {
if let mode @ Some(_) = config.force_pass_mode {
return mode;
}
}