Skip to content

Commit 3896af1

Browse files
committed
rewrite target-without-atomic-cas to rmake
1 parent e45d72d commit 3896af1

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-3
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,6 @@ run-make/symbol-mangling-hashed/Makefile
162162
run-make/symbol-visibility/Makefile
163163
run-make/symbols-include-type-name/Makefile
164164
run-make/sysroot-crates-are-unstable/Makefile
165-
run-make/target-cpu-native/Makefile
166-
run-make/target-specs/Makefile
167-
run-make/target-without-atomic-cas/Makefile
168165
run-make/test-benches/Makefile
169166
run-make/test-harness/Makefile
170167
run-make/thumb-none-cortex-m/Makefile

tests/run-make/target-cpu-native/rmake.rs

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// warnings when used, and that binaries produced by it can also be successfully executed.
44
// See https://github.com/rust-lang/rust/pull/23238
55

6-
// FIXME(Oneirical): only-linux only-x86_64
7-
86
use run_make_support::{run, rustc};
97

108
fn main() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Target-specific compilation in rustc used to have case-by-case peculiarities in 2014,
22
// with the compiler having redundant target types and unspecific names. An overarching rework
3-
// in #161156 changed the way the target flag functions, and this test attempts compilation
3+
// in #16156 changed the way the target flag functions, and this test attempts compilation
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

tests/run-make/target-without-atomic-cas/Makefile

-5
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// ARM Cortex-M are a class of processors supported by the rust compiler. However,
2+
// they cannot support any atomic features, such as Arc. This test simply prints
3+
// the configuration details of one Cortex target, and checks that the compiler
4+
// does not falsely list atomic support.
5+
// See https://github.com/rust-lang/rust/pull/36874
6+
7+
use run_make_support::rustc;
8+
9+
// The target used below doesn't support atomic CAS operations. Verify that's the case
10+
fn main() {
11+
rustc()
12+
.print("cfg")
13+
.target("thumbv6m-none-eabi")
14+
.run()
15+
.assert_stdout_not_contains(r#"target_has_atomic="ptr""#);
16+
}

0 commit comments

Comments
 (0)