Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ARM instead of SystemZ for testing uninstalled targets #39945

Merged
merged 1 commit into from
Feb 25, 2017

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Feb 19, 2017

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.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@petrochenkov
Copy link
Contributor Author

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 21, 2017

📌 Commit 9322a38 has been approved by alexcrichton

eddyb added a commit to eddyb/rust that referenced this pull request Feb 25, 2017
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.
eddyb added a commit to eddyb/rust that referenced this pull request Feb 25, 2017
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.
bors added a commit that referenced this pull request Feb 25, 2017
@bors bors merged commit 9322a38 into rust-lang:master Feb 25, 2017
@petrochenkov petrochenkov deleted the llvmtarg branch March 16, 2017 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants