Skip to content

Commit b4acf60

Browse files
committed
rustup; patch out atomix_min/max tests
1 parent 8dc55e6 commit b4acf60

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed

rust-src.diff

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
diff --git a/library/core/tests/atomic.rs b/library/core/tests/atomic.rs
2+
index b735957666f..539982eb0e4 100644
3+
--- a/library/core/tests/atomic.rs
4+
+++ b/library/core/tests/atomic.rs
5+
@@ -61,6 +61,7 @@ fn uint_xor() {
6+
7+
#[test]
8+
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
9+
+#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min
10+
fn uint_min() {
11+
let x = AtomicUsize::new(0xf731);
12+
assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731);
13+
@@ -71,6 +72,7 @@ fn uint_min() {
14+
15+
#[test]
16+
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
17+
+#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max
18+
fn uint_max() {
19+
let x = AtomicUsize::new(0x137f);
20+
assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f);
21+
@@ -109,6 +111,7 @@ fn int_xor() {
22+
23+
#[test]
24+
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
25+
+#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min
26+
fn int_min() {
27+
let x = AtomicIsize::new(0xf731);
28+
assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731);
29+
@@ -119,6 +122,7 @@ fn int_min() {
30+
31+
#[test]
32+
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
33+
+#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max
34+
fn int_max() {
35+
let x = AtomicIsize::new(0x137f);
36+
assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f);

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-12-21
1+
nightly-2021-02-23

0 commit comments

Comments
 (0)