diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2017-02-25 14:13:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-25 14:13:21 +0200 |
| commit | 16202862b2540a5259c6011b27ec5278da71879c (patch) | |
| tree | c72533fe734324d33bc1e9952acad7e9dcd0d9bd | |
| parent | a8ab222fd5b5ee0832f3bd4d0046b724ff51d014 (diff) | |
| parent | 9322a38534c9ad4e6c6a048580ffd68e842d1077 (diff) | |
Rollup merge of #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.
| -rw-r--r-- | src/test/compile-fail/issue-37131.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/compile-fail/issue-37131.rs b/src/test/compile-fail/issue-37131.rs index 88c6eb7f515..efb0b249a8a 100644 --- a/src/test/compile-fail/issue-37131.rs +++ b/src/test/compile-fail/issue-37131.rs @@ -11,8 +11,8 @@ // Tests that compiling for a target which is not installed will result in a helpful // error message. -// compile-flags: --target=s390x-unknown-linux-gnu -// ignore s390x +// compile-flags: --target=thumbv6m-none-eabi +// ignore-arm // error-pattern:target may not be installed fn main() { } |
