Skip to content

Commit 4827d41

Browse files
committed
Auto merge of rust-lang#2627 - RalfJung:ignore-windows, r=RalfJung
update ignore-windows comments Turns out 2 of these tests can actually be enabled. :)
2 parents 3321c2d + 676e53f commit 4827d41

File tree

7 files changed

+5
-7
lines changed

7 files changed

+5
-7
lines changed

src/tools/miri/tests/fail/data_race/stack_pop_race.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ignore-target-windows: Concurrency on Windows is not supported yet.
21
//@compile-flags: -Zmiri-preemption-rate=0
32
use std::thread;
43

src/tools/miri/tests/fail/panic/no_std.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// windows tls dtors go through libstd right now, thus this test
44
// cannot pass. When windows tls dtors go through the special magic
55
// windows linker section, we can run this test on windows again.
6-
//@ignore-target-windows
6+
//@ignore-target-windows: no-std not supported on Windows
77

88
// Plumbing to let us use `writeln!` to host stderr:
99

src/tools/miri/tests/pass/concurrency/sync.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows: Concurrency on Windows is not supported yet.
1+
//@ignore-target-windows: Condvars on Windows are not supported yet.
22
//@compile-flags: -Zmiri-disable-isolation -Zmiri-strict-provenance
33

44
use std::sync::{Arc, Barrier, Condvar, Mutex, Once, RwLock};

src/tools/miri/tests/pass/concurrency/sync_nopreempt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows: Concurrency on Windows is not supported yet.
1+
//@ignore-target-windows: Condvars on Windows are not supported yet.
22
// We are making scheduler assumptions here.
33
//@compile-flags: -Zmiri-strict-provenance -Zmiri-preemption-rate=0
44

src/tools/miri/tests/pass/no_std.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// windows tls dtors go through libstd right now, thus this test
44
// cannot pass. When windows tls dtors go through the special magic
55
// windows linker section, we can run this test on windows again.
6-
//@ignore-target-windows
6+
//@ignore-target-windows: no-std not supported on Windows
77

88
// Plumbing to let us use `writeln!` to host stdout:
99

src/tools/miri/tests/pass/shims/env/current_exe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows
1+
//@ignore-target-windows: current_exe not supported on Windows
22
//@only-on-host: the Linux std implementation opens /proc/self/exe, which doesn't work cross-target
33
//@compile-flags: -Zmiri-disable-isolation
44
use std::env;

src/tools/miri/tests/pass/shims/sleep_long.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ignore-target-windows: no threads nor sleep on Windows
21
//@compile-flags: -Zmiri-ignore-leaks -Zmiri-disable-isolation
32
use std::sync::{Arc, Mutex};
43
use std::thread;

0 commit comments

Comments
 (0)