Skip to content

Commit 49fca26

Browse files
Rollup merge of #82391 - RalfJung:miri-atomic-minmax, r=dtolnay
disable atomic_max/min tests in Miri Disable some tests that currently [fail in Miri](https://travis-ci.com/github/RalfJung/miri-test-libstd/builds/217788631).
2 parents 98511dd + dd9ab16 commit 49fca26

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

library/core/tests/atomic.rs

+4
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ fn uint_xor() {
6161

6262
#[test]
6363
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
64+
#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min
6465
fn uint_min() {
6566
let x = AtomicUsize::new(0xf731);
6667
assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731);
@@ -71,6 +72,7 @@ fn uint_min() {
7172

7273
#[test]
7374
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
75+
#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max
7476
fn uint_max() {
7577
let x = AtomicUsize::new(0x137f);
7678
assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f);
@@ -109,6 +111,7 @@ fn int_xor() {
109111

110112
#[test]
111113
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
114+
#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_min
112115
fn int_min() {
113116
let x = AtomicIsize::new(0xf731);
114117
assert_eq!(x.fetch_min(0x137f, SeqCst), 0xf731);
@@ -119,6 +122,7 @@ fn int_min() {
119122

120123
#[test]
121124
#[cfg(any(not(target_arch = "arm"), target_os = "linux"))] // Missing intrinsic in compiler-builtins
125+
#[cfg_attr(miri, ignore)] // FIXME: Miri does not support atomic_max
122126
fn int_max() {
123127
let x = AtomicIsize::new(0x137f);
124128
assert_eq!(x.fetch_max(0xf731, SeqCst), 0x137f);

0 commit comments

Comments
 (0)