Skip to content

Commit 3682d8c

Browse files
authored
Rollup merge of #144668 - daltenty:daltenty/runmake-llvm-components, r=jieyouxu
[test][run-make] add needs-llvm-components Add some constraints to run-make tests that require specific target support and will fail without them.
2 parents 08e26fc + 21af154 commit 3682d8c

File tree

5 files changed

+5
-0
lines changed

5 files changed

+5
-0
lines changed

tests/run-make/link-cfg/rmake.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
//@ ignore-cross-compile
1414
// Reason: the compiled binary is executed
15+
//@ needs-llvm-components: x86
1516

1617
use run_make_support::{bare_rustc, build_native_dynamic_lib, build_native_static_lib, run, rustc};
1718

tests/run-make/mismatching-target-triples/rmake.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// now replaced by a clearer normal error message. This test checks that this aforementioned
55
// error message is used.
66
// See https://github.com/rust-lang/rust/issues/10814
7+
//@ needs-llvm-components: x86
78

89
use run_make_support::rustc;
910

tests/run-make/musl-default-linking/rmake.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use run_make_support::{rustc, serde_json};
44
// Per https://github.com/rust-lang/compiler-team/issues/422,
55
// we should be trying to move these targets to dynamically link
66
// musl libc by default.
7+
//@ needs-llvm-components: aarch64 arm mips powerpc riscv systemz x86
78
static LEGACY_STATIC_LINKING_TARGETS: &[&'static str] = &[
89
"aarch64-unknown-linux-musl",
910
"arm-unknown-linux-musleabi",

tests/run-make/rustdoc-target-spec-json-path/rmake.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Test that rustdoc will properly canonicalize the target spec json path just like rustc.
2+
//@ needs-llvm-components: x86
23

34
use run_make_support::{cwd, rustc, rustdoc};
45

tests/run-make/target-specs/rmake.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// with the target flag's bundle of new features to check that compilation either succeeds while
55
// using them correctly, or fails with the right error message when using them improperly.
66
// See https://github.com/rust-lang/rust/pull/16156
7+
//@ needs-llvm-components: x86
78

89
use run_make_support::{diff, rfs, rustc};
910

0 commit comments

Comments
 (0)