Skip to content

Commit ea07456

Browse files
authored
Rollup merge of #122295 - Nadrieril:mir-opt-run-current-target, r=Mark-Simulacrum
mir-opt: always run tests for the current target Currently, `./x.py test tests/mir-opt` runs only the tests for the current target, and `./x.py test tests/mir-opt --bless` runs tests for a representative set of targets. That representative set does not include the current target however, which means `--bless` can succeed when tests fail without it. This PR ensures we run the current target always. Fixes #122292 cc ``@RalfJung``
2 parents a5dbdc2 + 222bdad commit ea07456

File tree

1 file changed

+4
-2
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+4
-2
lines changed

src/bootstrap/src/core/build_steps/test.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1548,6 +1548,10 @@ impl Step for MirOpt {
15481548
})
15491549
};
15501550

1551+
run(self.target);
1552+
1553+
// Run more targets with `--bless`. But we always run the host target first, since some
1554+
// tests use very specific `only` clauses that are not covered by the target set below.
15511555
if builder.config.cmd.bless() {
15521556
// All that we really need to do is cover all combinations of 32/64-bit and unwind/abort,
15531557
// but while we're at it we might as well flex our cross-compilation support. This
@@ -1566,8 +1570,6 @@ impl Step for MirOpt {
15661570
});
15671571
run(panic_abort_target);
15681572
}
1569-
} else {
1570-
run(self.target);
15711573
}
15721574
}
15731575
}

0 commit comments

Comments
 (0)