Skip to content

Commit 1620286

Browse files
authored
Rollup merge of rust-lang#39945 - petrochenkov:llvmtarg, r=alexcrichton
Use ARM instead of SystemZ for testing uninstalled targets This needs some explanation. `config.toml` has section `targets` listing backends that are built during LLVM build: ``` targets = "X86;ARM;AArch64;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX" ``` It would be reasonable to expect that `targets = "X86"` would be enough for doing a local build in typical case (building on x86 and not working on some non-x86 platform-specific functionality). However, for `x.py test` to pass successfully you have to add ARM and SystemZ to the target list as well (`targets = "X86;ARM;SystemZ"`), because two tests (`compile-fail/issue-37131.rs` and `run-make\target-without-atomics`) require these architectures to be enabled in LLVM. This patch moves `compile-fail/issue-37131.rs` from SystemZ to ARM, so `targets = "X86;ARM"` becomes sufficient for running the full test suite without errors.
2 parents a8ab222 + 9322a38 commit 1620286

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/test/compile-fail/issue-37131.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// Tests that compiling for a target which is not installed will result in a helpful
1212
// error message.
1313

14-
// compile-flags: --target=s390x-unknown-linux-gnu
15-
// ignore s390x
14+
// compile-flags: --target=thumbv6m-none-eabi
15+
// ignore-arm
1616

1717
// error-pattern:target may not be installed
1818
fn main() { }

0 commit comments

Comments
 (0)