Skip to content

Commit bcedb5b

Browse files
authored
Rollup merge of rust-lang#105246 - JakobDegen:run-mir-tests, r=jyn514
Fix --pass in compiletest This makes `x test src/test/mir-opt --pass run` actually do the thing it says it does. The resulting tests do not pass, I'll fix that in a follow up.
2 parents 4ba15b2 + 01a4898 commit bcedb5b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/tools/compiletest/src/header.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,9 @@ impl TestProps {
260260
props.load_from(testfile, cfg, config);
261261

262262
match (props.pass_mode, props.fail_mode) {
263-
(None, None) => props.fail_mode = Some(FailMode::Check),
264-
(Some(_), None) | (None, Some(_)) => {}
263+
(None, None) if config.mode == Mode::Ui => props.fail_mode = Some(FailMode::Check),
265264
(Some(_), Some(_)) => panic!("cannot use a *-fail and *-pass mode together"),
265+
_ => {}
266266
}
267267

268268
props
@@ -522,8 +522,8 @@ impl TestProps {
522522
}
523523

524524
pub fn pass_mode(&self, config: &Config) -> Option<PassMode> {
525-
if !self.ignore_pass && self.fail_mode.is_none() && config.mode == Mode::Ui {
526-
if let (mode @ Some(_), Some(_)) = (config.force_pass_mode, self.pass_mode) {
525+
if !self.ignore_pass && self.fail_mode.is_none() {
526+
if let mode @ Some(_) = config.force_pass_mode {
527527
return mode;
528528
}
529529
}

0 commit comments

Comments
 (0)