Skip to content

Commit c558db3

Browse files
committed
Modify some run-make tests to use //@ needs-target-std
Instead of a jumble of `ignore-$target`s, `ignore-none` and `ignore-nvptx`.
1 parent c5b8123 commit c558db3

File tree

6 files changed

+6
-24
lines changed

6 files changed

+6
-24
lines changed

tests/run-make/cpp-global-destructors/rmake.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,11 @@
66
//@ ignore-cross-compile
77
// Reason: the compiled binary is executed
88

9-
//@ ignore-none
10-
// Reason: no-std is not supported.
119
//@ ignore-wasm32
1210
//@ ignore-wasm64
1311
// Reason: compiling C++ to WASM may cause problems.
1412

15-
// Neither of these are tested in full CI.
16-
//@ ignore-nvptx64-nvidia-cuda
17-
// Reason: can't find crate "std"
13+
// Not exercised in full CI, but sgx technically supports std.
1814
//@ ignore-sgx
1915

2016
use run_make_support::{build_native_static_lib_cxx, run, rustc};

tests/run-make/export-executable-symbols/rmake.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
// (See #85673)
1111
//@ ignore-wasm32
1212
//@ ignore-wasm64
13-
//@ ignore-none
14-
// Reason: no-std is not supported
13+
//@ needs-target-std
1514

1615
use run_make_support::{bin_name, llvm_readobj, rustc};
1716

tests/run-make/incr-foreign-head-span/rmake.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
// source file from disk during compilation of a downstream crate.
66
// See https://github.com/rust-lang/rust/issues/86480
77

8-
//@ ignore-none
9-
// Reason: no-std is not supported
10-
//@ ignore-nvptx64-nvidia-cuda
11-
// Reason: can't find crate for 'std'
8+
//@ needs-target-std
129

1310
use run_make_support::{rfs, rust_lib_name, rustc};
1411

tests/run-make/incr-prev-body-beyond-eof/rmake.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
// was hashed by rustc in addition to the span length, and the fix still
88
// works.
99

10-
//@ ignore-none
11-
// reason: no-std is not supported
12-
13-
//@ ignore-nvptx64-nvidia-cuda
14-
// FIXME: can't find crate for `std`
10+
//@ needs-target-std
1511

1612
use run_make_support::{rfs, rustc};
1713

tests/run-make/incr-test-moved-file/rmake.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
// for successful compilation.
1010
// See https://github.com/rust-lang/rust/issues/83112
1111

12-
//@ ignore-none
13-
// Reason: no-std is not supported
14-
//@ ignore-nvptx64-nvidia-cuda
15-
// FIXME: can't find crate for 'std'
12+
//@ needs-target-std
1613

1714
use run_make_support::{rfs, rustc};
1815

tests/run-make/moved-src-dir-fingerprint-ice/rmake.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
// sessions.
1313
// See https://github.com/rust-lang/rust/issues/85019
1414

15-
//@ ignore-none
16-
// Reason: no-std is not supported
17-
//@ ignore-nvptx64-nvidia-cuda
18-
// FIXME: can't find crate for 'std'
15+
//@ needs-target-std
1916

2017
use run_make_support::{rfs, rust_lib_name, rustc};
2118

0 commit comments

Comments
 (0)