Skip to content

Commit d70be67

Browse files
Rollup merge of #112753 - Zalathar:no-bless, r=clubby789
Don't try to auto-bless 32-bit `mir-opt` tests on ARM Mac hosts #112418 added special support for automatically blessing 32-bit output on 64-bit hosts, for the subset of `mir-opt` tests that are pointer-width-dependent. This relies on the 64-bit host having some corresponding 32-bit target that can be built “easily”. For most 64-bit hosts this is fine, but ARM Macs don't have a corresponding 32-bit target. (There have never been 32-bit ARM Macs, and ARM Macs don't have the libraries needed for building `i686-apple-darwin`.) There is an entry for `("i686-apple-darwin", "aarch64-apple-darwin")` in the list of corresponding 32-bit platforms, but this doesn't actually work on ARM Macs. Instead, the bootstrap invocation fails to build the necessary 32-bit target support, and nothing gets tested or blessed. According to [this Zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Can't.20bless.20any.20mir-opt.20tests.20on.20aarch64.20Mac/near/367109789), that mapping was only added because the author assumed it would work. But since it doesn't actually work on ARM Macs, the solution is to just remove that mapping. With the mapping removed, ARM Macs still can't auto-bless 32-bit output (they will see a warning instead), but at least they can now bless the output of `mir-opt` tests that don't care about pointer width.
2 parents b598ea1 + b198589 commit d70be67

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/bootstrap/test.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ const MIR_OPT_BLESS_TARGET_MAPPING: &[(&str, &str)] = &[
4444
("i686-pc-windows-msvc", "x86_64-pc-windows-msvc"),
4545
("i686-pc-windows-gnu", "x86_64-pc-windows-gnu"),
4646
("i686-apple-darwin", "x86_64-apple-darwin"),
47-
("i686-apple-darwin", "aarch64-apple-darwin"),
47+
// ARM Macs don't have a corresponding 32-bit target that they can (easily)
48+
// build for, so there is no entry for "aarch64-apple-darwin" here.
4849
];
4950

5051
fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> bool {

0 commit comments

Comments
 (0)