From 1c85975768d42e21ec5ead95b5b301f3137c80cf Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 17 Jul 2022 21:54:10 -0400
Subject: [PATCH] ui_test: more robust syntax for target filtering

---
 .../libc_pthread_create_main_terminate.rs          |  2 +-
 .../fail/concurrency/libc_pthread_join_detached.rs |  2 +-
 tests/fail/concurrency/libc_pthread_join_joined.rs |  2 +-
 tests/fail/concurrency/libc_pthread_join_main.rs   |  2 +-
 .../fail/concurrency/libc_pthread_join_multiple.rs |  2 +-
 tests/fail/concurrency/libc_pthread_join_self.rs   |  2 +-
 tests/fail/concurrency/thread-spawn.rs             |  2 +-
 .../concurrency/thread_local_static_dealloc.rs     |  2 +-
 tests/fail/concurrency/too_few_args.rs             |  2 +-
 tests/fail/concurrency/too_many_args.rs            |  2 +-
 tests/fail/concurrency/unwind_top_of_stack.rs      |  2 +-
 tests/fail/data_race/alloc_read_race.rs            |  2 +-
 tests/fail/data_race/alloc_write_race.rs           |  2 +-
 tests/fail/data_race/atomic_read_na_write_race1.rs |  2 +-
 tests/fail/data_race/atomic_read_na_write_race2.rs |  2 +-
 tests/fail/data_race/atomic_write_na_read_race1.rs |  2 +-
 tests/fail/data_race/atomic_write_na_read_race2.rs |  2 +-
 .../fail/data_race/atomic_write_na_write_race1.rs  |  2 +-
 .../fail/data_race/atomic_write_na_write_race2.rs  |  2 +-
 tests/fail/data_race/dangling_thread_async_race.rs |  2 +-
 tests/fail/data_race/dangling_thread_race.rs       |  2 +-
 tests/fail/data_race/dealloc_read_race1.rs         |  2 +-
 tests/fail/data_race/dealloc_read_race2.rs         |  2 +-
 tests/fail/data_race/dealloc_read_race_stack.rs    |  2 +-
 tests/fail/data_race/dealloc_write_race1.rs        |  2 +-
 tests/fail/data_race/dealloc_write_race2.rs        |  2 +-
 tests/fail/data_race/dealloc_write_race_stack.rs   |  2 +-
 tests/fail/data_race/enable_after_join_to_main.rs  |  2 +-
 tests/fail/data_race/fence_after_load.rs           |  2 +-
 tests/fail/data_race/read_write_race.rs            |  2 +-
 tests/fail/data_race/read_write_race_stack.rs      |  2 +-
 tests/fail/data_race/relax_acquire_race.rs         |  2 +-
 tests/fail/data_race/release_seq_race.rs           |  2 +-
 .../fail/data_race/release_seq_race_same_thread.rs |  2 +-
 tests/fail/data_race/rmw_race.rs                   |  2 +-
 tests/fail/data_race/stack_pop_race.rs             |  2 +-
 tests/fail/data_race/write_write_race.rs           |  2 +-
 tests/fail/data_race/write_write_race_stack.rs     |  2 +-
 tests/fail/environ-gets-deallocated.rs             |  2 +-
 tests/fail/fs/close_stdout.rs                      |  2 +-
 tests/fail/fs/isolated_file.rs                     |  2 +-
 tests/fail/fs/isolated_stdin.rs                    |  2 +-
 tests/fail/fs/read_from_stdout.rs                  |  2 +-
 tests/fail/fs/unix_open_missing_required_mode.rs   |  2 +-
 tests/fail/fs/write_to_stdin.rs                    |  2 +-
 tests/fail/should-pass/cpp20_rwc_syncs.rs          |  2 +-
 .../fail/sync/libc_pthread_cond_double_destroy.rs  |  2 +-
 .../sync/libc_pthread_condattr_double_destroy.rs   |  2 +-
 .../fail/sync/libc_pthread_mutex_NULL_deadlock.rs  |  2 +-
 tests/fail/sync/libc_pthread_mutex_deadlock.rs     |  2 +-
 .../sync/libc_pthread_mutex_default_deadlock.rs    |  2 +-
 .../fail/sync/libc_pthread_mutex_destroy_locked.rs |  2 +-
 .../fail/sync/libc_pthread_mutex_double_destroy.rs |  2 +-
 .../sync/libc_pthread_mutex_normal_deadlock.rs     |  2 +-
 .../libc_pthread_mutex_normal_unlock_unlocked.rs   |  2 +-
 tests/fail/sync/libc_pthread_mutex_wrong_owner.rs  |  2 +-
 .../sync/libc_pthread_mutexattr_double_destroy.rs  |  2 +-
 .../libc_pthread_rwlock_destroy_read_locked.rs     |  2 +-
 .../libc_pthread_rwlock_destroy_write_locked.rs    |  2 +-
 .../sync/libc_pthread_rwlock_double_destroy.rs     |  2 +-
 ...ead_rwlock_read_write_deadlock_single_thread.rs |  2 +-
 .../sync/libc_pthread_rwlock_read_wrong_owner.rs   |  2 +-
 .../sync/libc_pthread_rwlock_unlock_unlocked.rs    |  2 +-
 .../libc_pthread_rwlock_write_read_deadlock.rs     |  2 +-
 ...ead_rwlock_write_read_deadlock_single_thread.rs |  2 +-
 .../libc_pthread_rwlock_write_write_deadlock.rs    |  2 +-
 ...ad_rwlock_write_write_deadlock_single_thread.rs |  2 +-
 .../sync/libc_pthread_rwlock_write_wrong_owner.rs  |  2 +-
 tests/fail/unsupported_signal.rs                   |  2 +-
 tests/fail/weak_memory/racing_mixed_size.rs        |  2 +-
 tests/fail/weak_memory/racing_mixed_size_read.rs   |  2 +-
 tests/panic/panic/unsupported_syscall.rs           |  4 ++--
 tests/pass/0weak_memory_consistency.rs             |  2 +-
 tests/pass/calloc.rs                               |  2 +-
 tests/pass/concurrency/channels.rs                 |  2 +-
 .../pass/concurrency/concurrent_caller_location.rs |  2 +-
 tests/pass/concurrency/data_race.rs                |  2 +-
 .../pass/concurrency/disable_data_race_detector.rs |  2 +-
 tests/pass/concurrency/issue1643.rs                |  2 +-
 tests/pass/concurrency/libc_pthread_cond.rs        |  4 ++--
 tests/pass/concurrency/linux-futex.rs              |  2 +-
 tests/pass/concurrency/simple.rs                   |  2 +-
 tests/pass/concurrency/spin_loop.rs                |  2 +-
 tests/pass/concurrency/spin_loops_nopreempt.rs     |  2 +-
 tests/pass/concurrency/sync.rs                     |  2 +-
 tests/pass/concurrency/sync_nopreempt.rs           |  2 +-
 tests/pass/concurrency/thread_locals.rs            |  2 +-
 tests/pass/concurrency/tls_lib_drop.rs             |  2 +-
 tests/pass/concurrency/tls_pthread_drop_order.rs   |  2 +-
 tests/pass/fs.rs                                   |  2 +-
 tests/pass/fs_with_isolation.rs                    |  2 +-
 tests/pass/libc.rs                                 |  2 +-
 tests/pass/linux-getrandom-without-isolation.rs    |  2 +-
 tests/pass/linux-getrandom.rs                      |  2 +-
 tests/pass/malloc.rs                               |  2 +-
 tests/pass/no_std.rs                               |  2 +-
 tests/pass/panic/concurrent-panic.rs               |  2 +-
 tests/pass/threadleak_ignored.rs                   |  2 +-
 tests/pass/weak_memory/extra_cpp.rs                |  2 +-
 tests/pass/weak_memory/extra_cpp_unsafe.rs         |  2 +-
 tests/pass/weak_memory/weak.rs                     |  2 +-
 tests/pass/wtf8.rs                                 |  2 +-
 ui_test/src/parser.rs                              | 14 ++++++++------
 103 files changed, 112 insertions(+), 110 deletions(-)

diff --git a/tests/fail/concurrency/libc_pthread_create_main_terminate.rs b/tests/fail/concurrency/libc_pthread_create_main_terminate.rs
index ab80cdd205bc..169a021215d5 100644
--- a/tests/fail/concurrency/libc_pthread_create_main_terminate.rs
+++ b/tests/fail/concurrency/libc_pthread_create_main_terminate.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 //@error-pattern: the main thread terminated without waiting for all remaining threads
 
 // Check that we terminate the program when the main thread terminates.
diff --git a/tests/fail/concurrency/libc_pthread_join_detached.rs b/tests/fail/concurrency/libc_pthread_join_detached.rs
index 1ec1d630ecb9..6f0d45e2dc09 100644
--- a/tests/fail/concurrency/libc_pthread_join_detached.rs
+++ b/tests/fail/concurrency/libc_pthread_join_detached.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 // Joining a detached thread is undefined behavior.
 
diff --git a/tests/fail/concurrency/libc_pthread_join_joined.rs b/tests/fail/concurrency/libc_pthread_join_joined.rs
index b067556e51b0..77f59fabca5e 100644
--- a/tests/fail/concurrency/libc_pthread_join_joined.rs
+++ b/tests/fail/concurrency/libc_pthread_join_joined.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 // Joining an already joined thread is undefined behavior.
 
diff --git a/tests/fail/concurrency/libc_pthread_join_main.rs b/tests/fail/concurrency/libc_pthread_join_main.rs
index ebfe8c865e3d..aff28bcc9b57 100644
--- a/tests/fail/concurrency/libc_pthread_join_main.rs
+++ b/tests/fail/concurrency/libc_pthread_join_main.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 // Joining the main thread is undefined behavior.
 
diff --git a/tests/fail/concurrency/libc_pthread_join_multiple.rs b/tests/fail/concurrency/libc_pthread_join_multiple.rs
index 39cd9ff77976..d4d54d3a23fd 100644
--- a/tests/fail/concurrency/libc_pthread_join_multiple.rs
+++ b/tests/fail/concurrency/libc_pthread_join_multiple.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 // Joining the same thread from multiple threads is undefined behavior.
 
diff --git a/tests/fail/concurrency/libc_pthread_join_self.rs b/tests/fail/concurrency/libc_pthread_join_self.rs
index 7b91560ab6b1..b911b2db3a16 100644
--- a/tests/fail/concurrency/libc_pthread_join_self.rs
+++ b/tests/fail/concurrency/libc_pthread_join_self.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 // We are making scheduler assumptions here.
 //@compile-flags: -Zmiri-preemption-rate=0
 
diff --git a/tests/fail/concurrency/thread-spawn.rs b/tests/fail/concurrency/thread-spawn.rs
index 650a42b43b5d..84848e35a0f3 100644
--- a/tests/fail/concurrency/thread-spawn.rs
+++ b/tests/fail/concurrency/thread-spawn.rs
@@ -1,4 +1,4 @@
-//@only-windows: Only Windows is not supported.
+//@only-target-windows: Only Windows is not supported.
 
 use std::thread;
 
diff --git a/tests/fail/concurrency/thread_local_static_dealloc.rs b/tests/fail/concurrency/thread_local_static_dealloc.rs
index f638e21901dd..7c54e3bca7c1 100644
--- a/tests/fail/concurrency/thread_local_static_dealloc.rs
+++ b/tests/fail/concurrency/thread_local_static_dealloc.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 //! Ensure that thread-local statics get deallocated when the thread dies.
 
diff --git a/tests/fail/concurrency/too_few_args.rs b/tests/fail/concurrency/too_few_args.rs
index 5d173b384807..11e97ca290f4 100644
--- a/tests/fail/concurrency/too_few_args.rs
+++ b/tests/fail/concurrency/too_few_args.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 //! The thread function must have exactly one argument.
 
diff --git a/tests/fail/concurrency/too_many_args.rs b/tests/fail/concurrency/too_many_args.rs
index 8305765a37a3..dd44207a6255 100644
--- a/tests/fail/concurrency/too_many_args.rs
+++ b/tests/fail/concurrency/too_many_args.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 //! The thread function must have exactly one argument.
 
diff --git a/tests/fail/concurrency/unwind_top_of_stack.rs b/tests/fail/concurrency/unwind_top_of_stack.rs
index 3bd9284c7c8a..179ff9c146e8 100644
--- a/tests/fail/concurrency/unwind_top_of_stack.rs
+++ b/tests/fail/concurrency/unwind_top_of_stack.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-abi-check
 
 //! Unwinding past the top frame of a stack is Undefined Behavior.
diff --git a/tests/fail/data_race/alloc_read_race.rs b/tests/fail/data_race/alloc_read_race.rs
index bdd38ea05693..f3f63aeb2b83 100644
--- a/tests/fail/data_race/alloc_read_race.rs
+++ b/tests/fail/data_race/alloc_read_race.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 #![feature(new_uninit)]
 
diff --git a/tests/fail/data_race/alloc_write_race.rs b/tests/fail/data_race/alloc_write_race.rs
index 1322f727e6f0..a2738c3879b3 100644
--- a/tests/fail/data_race/alloc_write_race.rs
+++ b/tests/fail/data_race/alloc_write_race.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 #![feature(new_uninit)]
 
diff --git a/tests/fail/data_race/atomic_read_na_write_race1.rs b/tests/fail/data_race/atomic_read_na_write_race1.rs
index 3cdb9d4a6543..1ef021edc8cc 100644
--- a/tests/fail/data_race/atomic_read_na_write_race1.rs
+++ b/tests/fail/data_race/atomic_read_na_write_race1.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 #![feature(core_intrinsics)]
 
 use std::intrinsics;
diff --git a/tests/fail/data_race/atomic_read_na_write_race2.rs b/tests/fail/data_race/atomic_read_na_write_race2.rs
index 79f9cceb5c9c..493985f6cf17 100644
--- a/tests/fail/data_race/atomic_read_na_write_race2.rs
+++ b/tests/fail/data_race/atomic_read_na_write_race2.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
diff --git a/tests/fail/data_race/atomic_write_na_read_race1.rs b/tests/fail/data_race/atomic_write_na_read_race1.rs
index 6e9f37a9c43b..ca9c28abf1a9 100644
--- a/tests/fail/data_race/atomic_write_na_read_race1.rs
+++ b/tests/fail/data_race/atomic_write_na_read_race1.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
diff --git a/tests/fail/data_race/atomic_write_na_read_race2.rs b/tests/fail/data_race/atomic_write_na_read_race2.rs
index 4ab5abd5a3ee..77b2945f7371 100644
--- a/tests/fail/data_race/atomic_write_na_read_race2.rs
+++ b/tests/fail/data_race/atomic_write_na_read_race2.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 #![feature(core_intrinsics)]
 
 use std::intrinsics::atomic_store;
diff --git a/tests/fail/data_race/atomic_write_na_write_race1.rs b/tests/fail/data_race/atomic_write_na_write_race1.rs
index 4c4ec0865cc9..34922dd595ed 100644
--- a/tests/fail/data_race/atomic_write_na_write_race1.rs
+++ b/tests/fail/data_race/atomic_write_na_write_race1.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 #![feature(core_intrinsics)]
 
 use std::intrinsics::atomic_store;
diff --git a/tests/fail/data_race/atomic_write_na_write_race2.rs b/tests/fail/data_race/atomic_write_na_write_race2.rs
index 715c2d44b260..1d242ff3cdd6 100644
--- a/tests/fail/data_race/atomic_write_na_write_race2.rs
+++ b/tests/fail/data_race/atomic_write_na_write_race2.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
diff --git a/tests/fail/data_race/dangling_thread_async_race.rs b/tests/fail/data_race/dangling_thread_async_race.rs
index 732e89c89907..6264255265f6 100644
--- a/tests/fail/data_race/dangling_thread_async_race.rs
+++ b/tests/fail/data_race/dangling_thread_async_race.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::mem;
 use std::thread::{sleep, spawn};
diff --git a/tests/fail/data_race/dangling_thread_race.rs b/tests/fail/data_race/dangling_thread_race.rs
index 170fa8b77440..6f44fc69dbb7 100644
--- a/tests/fail/data_race/dangling_thread_race.rs
+++ b/tests/fail/data_race/dangling_thread_race.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::mem;
 use std::thread::{sleep, spawn};
diff --git a/tests/fail/data_race/dealloc_read_race1.rs b/tests/fail/data_race/dealloc_read_race1.rs
index 80a0fe2111ec..5349073ec3b7 100644
--- a/tests/fail/data_race/dealloc_read_race1.rs
+++ b/tests/fail/data_race/dealloc_read_race1.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 
diff --git a/tests/fail/data_race/dealloc_read_race2.rs b/tests/fail/data_race/dealloc_read_race2.rs
index 898588a1a0e8..bb9070ef7503 100644
--- a/tests/fail/data_race/dealloc_read_race2.rs
+++ b/tests/fail/data_race/dealloc_read_race2.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 
diff --git a/tests/fail/data_race/dealloc_read_race_stack.rs b/tests/fail/data_race/dealloc_read_race_stack.rs
index 475379a02ecf..e114fbb8b4f1 100644
--- a/tests/fail/data_race/dealloc_read_race_stack.rs
+++ b/tests/fail/data_race/dealloc_read_race_stack.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::ptr::null_mut;
diff --git a/tests/fail/data_race/dealloc_write_race1.rs b/tests/fail/data_race/dealloc_write_race1.rs
index 711b7ba9d4eb..35949920e102 100644
--- a/tests/fail/data_race/dealloc_write_race1.rs
+++ b/tests/fail/data_race/dealloc_write_race1.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 
diff --git a/tests/fail/data_race/dealloc_write_race2.rs b/tests/fail/data_race/dealloc_write_race2.rs
index e7b7d558ed9d..b569086c8c34 100644
--- a/tests/fail/data_race/dealloc_write_race2.rs
+++ b/tests/fail/data_race/dealloc_write_race2.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 
diff --git a/tests/fail/data_race/dealloc_write_race_stack.rs b/tests/fail/data_race/dealloc_write_race_stack.rs
index 7f6beb7f32d8..0c74c7adf59c 100644
--- a/tests/fail/data_race/dealloc_write_race_stack.rs
+++ b/tests/fail/data_race/dealloc_write_race_stack.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::ptr::null_mut;
diff --git a/tests/fail/data_race/enable_after_join_to_main.rs b/tests/fail/data_race/enable_after_join_to_main.rs
index 2e9fce198d1d..f2235b95257b 100644
--- a/tests/fail/data_race/enable_after_join_to_main.rs
+++ b/tests/fail/data_race/enable_after_join_to_main.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 
diff --git a/tests/fail/data_race/fence_after_load.rs b/tests/fail/data_race/fence_after_load.rs
index f41c7a25523e..8acbe12e82d6 100644
--- a/tests/fail/data_race/fence_after_load.rs
+++ b/tests/fail/data_race/fence_after_load.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 use std::sync::atomic::{fence, AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::thread;
diff --git a/tests/fail/data_race/read_write_race.rs b/tests/fail/data_race/read_write_race.rs
index e1134669f782..cff868fb699f 100644
--- a/tests/fail/data_race/read_write_race.rs
+++ b/tests/fail/data_race/read_write_race.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 
diff --git a/tests/fail/data_race/read_write_race_stack.rs b/tests/fail/data_race/read_write_race_stack.rs
index 802e90d222af..b22173fa5a94 100644
--- a/tests/fail/data_race/read_write_race_stack.rs
+++ b/tests/fail/data_race/read_write_race_stack.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-isolation -Zmir-opt-level=0 -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 // Note: mir-opt-level set to 0 to prevent the read of stack_var in thread 1
diff --git a/tests/fail/data_race/relax_acquire_race.rs b/tests/fail/data_race/relax_acquire_race.rs
index 4238372f21fa..b99388b8923c 100644
--- a/tests/fail/data_race/relax_acquire_race.rs
+++ b/tests/fail/data_race/relax_acquire_race.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::sync::atomic::{AtomicUsize, Ordering};
diff --git a/tests/fail/data_race/release_seq_race.rs b/tests/fail/data_race/release_seq_race.rs
index cd11aac95955..31fc5d9a479f 100644
--- a/tests/fail/data_race/release_seq_race.rs
+++ b/tests/fail/data_race/release_seq_race.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::sync::atomic::{AtomicUsize, Ordering};
diff --git a/tests/fail/data_race/release_seq_race_same_thread.rs b/tests/fail/data_race/release_seq_race_same_thread.rs
index 854ea09f11eb..c0ce437047a8 100644
--- a/tests/fail/data_race/release_seq_race_same_thread.rs
+++ b/tests/fail/data_race/release_seq_race_same_thread.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::sync::atomic::{AtomicUsize, Ordering};
diff --git a/tests/fail/data_race/rmw_race.rs b/tests/fail/data_race/rmw_race.rs
index 2f7f8986a49e..540b01b0935d 100644
--- a/tests/fail/data_race/rmw_race.rs
+++ b/tests/fail/data_race/rmw_race.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::sync::atomic::{AtomicUsize, Ordering};
diff --git a/tests/fail/data_race/stack_pop_race.rs b/tests/fail/data_race/stack_pop_race.rs
index 444c28d50aaf..8f371a680f11 100644
--- a/tests/fail/data_race/stack_pop_race.rs
+++ b/tests/fail/data_race/stack_pop_race.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-preemption-rate=0
 use std::thread;
 
diff --git a/tests/fail/data_race/write_write_race.rs b/tests/fail/data_race/write_write_race.rs
index fae4582e7e47..ac75c771e475 100644
--- a/tests/fail/data_race/write_write_race.rs
+++ b/tests/fail/data_race/write_write_race.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 
diff --git a/tests/fail/data_race/write_write_race_stack.rs b/tests/fail/data_race/write_write_race_stack.rs
index 4b83413b3922..5193b155512c 100644
--- a/tests/fail/data_race/write_write_race_stack.rs
+++ b/tests/fail/data_race/write_write_race_stack.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-disable-weak-memory-emulation -Zmiri-preemption-rate=0
 
 use std::ptr::null_mut;
diff --git a/tests/fail/environ-gets-deallocated.rs b/tests/fail/environ-gets-deallocated.rs
index 39629610c632..e4597140b844 100644
--- a/tests/fail/environ-gets-deallocated.rs
+++ b/tests/fail/environ-gets-deallocated.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Windows does not have a global environ list that the program can access directly
+//@ignore-target-windows: Windows does not have a global environ list that the program can access directly
 
 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
 fn get_environ() -> *const *const u8 {
diff --git a/tests/fail/fs/close_stdout.rs b/tests/fail/fs/close_stdout.rs
index 3271722de0f9..bc709fe36d57 100644
--- a/tests/fail/fs/close_stdout.rs
+++ b/tests/fail/fs/close_stdout.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 //@compile-flags: -Zmiri-disable-isolation
 
 // FIXME: standard handles cannot be closed (https://github.com/rust-lang/rust/issues/40032)
diff --git a/tests/fail/fs/isolated_file.rs b/tests/fail/fs/isolated_file.rs
index 00bb492147a8..9b664ffe52ac 100644
--- a/tests/fail/fs/isolated_file.rs
+++ b/tests/fail/fs/isolated_file.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: File handling is not implemented yet
+//@ignore-target-windows: File handling is not implemented yet
 //@error-pattern: `open` not available when isolation is enabled
 
 fn main() {
diff --git a/tests/fail/fs/isolated_stdin.rs b/tests/fail/fs/isolated_stdin.rs
index 27c66c58eb2f..cd54de3bcecc 100644
--- a/tests/fail/fs/isolated_stdin.rs
+++ b/tests/fail/fs/isolated_stdin.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/fs/read_from_stdout.rs b/tests/fail/fs/read_from_stdout.rs
index d78bc9f34d7d..949fe88f4333 100644
--- a/tests/fail/fs/read_from_stdout.rs
+++ b/tests/fail/fs/read_from_stdout.rs
@@ -1,5 +1,5 @@
 //@compile-flags: -Zmiri-disable-isolation
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/fs/unix_open_missing_required_mode.rs b/tests/fail/fs/unix_open_missing_required_mode.rs
index 03993db81f57..1f6beadcb82f 100644
--- a/tests/fail/fs/unix_open_missing_required_mode.rs
+++ b/tests/fail/fs/unix_open_missing_required_mode.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 //@compile-flags: -Zmiri-disable-isolation
 
 #![feature(rustc_private)]
diff --git a/tests/fail/fs/write_to_stdin.rs b/tests/fail/fs/write_to_stdin.rs
index 78ea0f4a18bd..4ad7b648e1cf 100644
--- a/tests/fail/fs/write_to_stdin.rs
+++ b/tests/fail/fs/write_to_stdin.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/should-pass/cpp20_rwc_syncs.rs b/tests/fail/should-pass/cpp20_rwc_syncs.rs
index 6478f446accc..dbac6469fbab 100644
--- a/tests/fail/should-pass/cpp20_rwc_syncs.rs
+++ b/tests/fail/should-pass/cpp20_rwc_syncs.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-ignore-leaks
 //@error-pattern: unreachable
 
diff --git a/tests/fail/sync/libc_pthread_cond_double_destroy.rs b/tests/fail/sync/libc_pthread_cond_double_destroy.rs
index 77235d485cde..d0a4ac46cb33 100644
--- a/tests/fail/sync/libc_pthread_cond_double_destroy.rs
+++ b/tests/fail/sync/libc_pthread_cond_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 #![feature(rustc_private)]
 
 /// Test that destroying a pthread_cond twice fails, even without a check for number validity
diff --git a/tests/fail/sync/libc_pthread_condattr_double_destroy.rs b/tests/fail/sync/libc_pthread_condattr_double_destroy.rs
index 3b4522fb046c..c64b32381384 100644
--- a/tests/fail/sync/libc_pthread_condattr_double_destroy.rs
+++ b/tests/fail/sync/libc_pthread_condattr_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 #![feature(rustc_private)]
 
 /// Test that destroying a pthread_condattr twice fails, even without a check for number validity
diff --git a/tests/fail/sync/libc_pthread_mutex_NULL_deadlock.rs b/tests/fail/sync/libc_pthread_mutex_NULL_deadlock.rs
index ade9903b9dd5..8797e895d8c8 100644
--- a/tests/fail/sync/libc_pthread_mutex_NULL_deadlock.rs
+++ b/tests/fail/sync/libc_pthread_mutex_NULL_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 //
 // Check that if we pass NULL attribute, then we get the default mutex type.
 
diff --git a/tests/fail/sync/libc_pthread_mutex_deadlock.rs b/tests/fail/sync/libc_pthread_mutex_deadlock.rs
index 597d7721b12d..7da6e5160000 100644
--- a/tests/fail/sync/libc_pthread_mutex_deadlock.rs
+++ b/tests/fail/sync/libc_pthread_mutex_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_mutex_default_deadlock.rs b/tests/fail/sync/libc_pthread_mutex_default_deadlock.rs
index dee5c80e9c40..70a85aa0f989 100644
--- a/tests/fail/sync/libc_pthread_mutex_default_deadlock.rs
+++ b/tests/fail/sync/libc_pthread_mutex_default_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 //
 // Check that if we do not set the mutex type, it is the default.
 
diff --git a/tests/fail/sync/libc_pthread_mutex_destroy_locked.rs b/tests/fail/sync/libc_pthread_mutex_destroy_locked.rs
index a7ef5e44c9da..fc69ace36993 100644
--- a/tests/fail/sync/libc_pthread_mutex_destroy_locked.rs
+++ b/tests/fail/sync/libc_pthread_mutex_destroy_locked.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_mutex_double_destroy.rs b/tests/fail/sync/libc_pthread_mutex_double_destroy.rs
index 8f60409b0052..9b539afc1992 100644
--- a/tests/fail/sync/libc_pthread_mutex_double_destroy.rs
+++ b/tests/fail/sync/libc_pthread_mutex_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 #![feature(rustc_private)]
 
 /// Test that destroying a pthread_mutex twice fails, even without a check for number validity
diff --git a/tests/fail/sync/libc_pthread_mutex_normal_deadlock.rs b/tests/fail/sync/libc_pthread_mutex_normal_deadlock.rs
index 45475249befc..944e86e106d7 100644
--- a/tests/fail/sync/libc_pthread_mutex_normal_deadlock.rs
+++ b/tests/fail/sync/libc_pthread_mutex_normal_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_mutex_normal_unlock_unlocked.rs b/tests/fail/sync/libc_pthread_mutex_normal_unlock_unlocked.rs
index da23819ebc31..c2bdce82b6f8 100644
--- a/tests/fail/sync/libc_pthread_mutex_normal_unlock_unlocked.rs
+++ b/tests/fail/sync/libc_pthread_mutex_normal_unlock_unlocked.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_mutex_wrong_owner.rs b/tests/fail/sync/libc_pthread_mutex_wrong_owner.rs
index d91245104b0e..eea4db711597 100644
--- a/tests/fail/sync/libc_pthread_mutex_wrong_owner.rs
+++ b/tests/fail/sync/libc_pthread_mutex_wrong_owner.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_mutexattr_double_destroy.rs b/tests/fail/sync/libc_pthread_mutexattr_double_destroy.rs
index 8fb7cc3ea603..620dbb94a78a 100644
--- a/tests/fail/sync/libc_pthread_mutexattr_double_destroy.rs
+++ b/tests/fail/sync/libc_pthread_mutexattr_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 #![feature(rustc_private)]
 
 /// Test that destroying a pthread_mutexattr twice fails, even without a check for number validity
diff --git a/tests/fail/sync/libc_pthread_rwlock_destroy_read_locked.rs b/tests/fail/sync/libc_pthread_rwlock_destroy_read_locked.rs
index 0efb6724c177..67b77ff28647 100644
--- a/tests/fail/sync/libc_pthread_rwlock_destroy_read_locked.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_destroy_read_locked.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_rwlock_destroy_write_locked.rs b/tests/fail/sync/libc_pthread_rwlock_destroy_write_locked.rs
index 11c09c1b1342..5bc5fe3c6bc4 100644
--- a/tests/fail/sync/libc_pthread_rwlock_destroy_write_locked.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_destroy_write_locked.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_rwlock_double_destroy.rs b/tests/fail/sync/libc_pthread_rwlock_double_destroy.rs
index 9de0383f9daf..7e756c5bb88f 100644
--- a/tests/fail/sync/libc_pthread_rwlock_double_destroy.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 #![feature(rustc_private)]
 
 /// Test that destroying a pthread_rwlock twice fails, even without a check for number validity
diff --git a/tests/fail/sync/libc_pthread_rwlock_read_write_deadlock_single_thread.rs b/tests/fail/sync/libc_pthread_rwlock_read_write_deadlock_single_thread.rs
index 9c8d22310cab..76fceb315f44 100644
--- a/tests/fail/sync/libc_pthread_rwlock_read_write_deadlock_single_thread.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_read_write_deadlock_single_thread.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_rwlock_read_wrong_owner.rs b/tests/fail/sync/libc_pthread_rwlock_read_wrong_owner.rs
index 361cc7cdd850..e971fd8c302a 100644
--- a/tests/fail/sync/libc_pthread_rwlock_read_wrong_owner.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_read_wrong_owner.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_rwlock_unlock_unlocked.rs b/tests/fail/sync/libc_pthread_rwlock_unlock_unlocked.rs
index 9d3ca275cb04..29cfd36cafc2 100644
--- a/tests/fail/sync/libc_pthread_rwlock_unlock_unlocked.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_unlock_unlocked.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_rwlock_write_read_deadlock.rs b/tests/fail/sync/libc_pthread_rwlock_write_read_deadlock.rs
index 3158b944a7f7..e9c5c17f3eba 100644
--- a/tests/fail/sync/libc_pthread_rwlock_write_read_deadlock.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_write_read_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_rwlock_write_read_deadlock_single_thread.rs b/tests/fail/sync/libc_pthread_rwlock_write_read_deadlock_single_thread.rs
index c6b468eb89b1..5ed25344e7c7 100644
--- a/tests/fail/sync/libc_pthread_rwlock_write_read_deadlock_single_thread.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_write_read_deadlock_single_thread.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_rwlock_write_write_deadlock.rs b/tests/fail/sync/libc_pthread_rwlock_write_write_deadlock.rs
index 91adaf85499f..3d15370e83dd 100644
--- a/tests/fail/sync/libc_pthread_rwlock_write_write_deadlock.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_write_write_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_rwlock_write_write_deadlock_single_thread.rs b/tests/fail/sync/libc_pthread_rwlock_write_write_deadlock_single_thread.rs
index 13a7ceefc7bb..14361bee54c0 100644
--- a/tests/fail/sync/libc_pthread_rwlock_write_write_deadlock_single_thread.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_write_write_deadlock_single_thread.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/sync/libc_pthread_rwlock_write_wrong_owner.rs b/tests/fail/sync/libc_pthread_rwlock_write_wrong_owner.rs
index a205bbcb6b55..668ccb3ecaef 100644
--- a/tests/fail/sync/libc_pthread_rwlock_write_wrong_owner.rs
+++ b/tests/fail/sync/libc_pthread_rwlock_write_wrong_owner.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/fail/unsupported_signal.rs b/tests/fail/unsupported_signal.rs
index 4319dc7c69fe..e9bd340fcafb 100644
--- a/tests/fail/unsupported_signal.rs
+++ b/tests/fail/unsupported_signal.rs
@@ -1,6 +1,6 @@
 //! `signal()` is special on Linux and macOS that it's only supported within libstd.
 //! The implementation is not complete enough to permit user code to call it.
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 #![feature(rustc_private)]
 
 extern crate libc;
diff --git a/tests/fail/weak_memory/racing_mixed_size.rs b/tests/fail/weak_memory/racing_mixed_size.rs
index d697e5f8fbea..a7c5a4191762 100644
--- a/tests/fail/weak_memory/racing_mixed_size.rs
+++ b/tests/fail/weak_memory/racing_mixed_size.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 #![feature(core_intrinsics)]
 
diff --git a/tests/fail/weak_memory/racing_mixed_size_read.rs b/tests/fail/weak_memory/racing_mixed_size_read.rs
index 0eacaeeaa9ee..aeaa6b68f6c8 100644
--- a/tests/fail/weak_memory/racing_mixed_size_read.rs
+++ b/tests/fail/weak_memory/racing_mixed_size_read.rs
@@ -1,6 +1,6 @@
 // We want to control preemption here.
 //@compile-flags: -Zmiri-preemption-rate=0
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 #![feature(core_intrinsics)]
 
diff --git a/tests/panic/panic/unsupported_syscall.rs b/tests/panic/panic/unsupported_syscall.rs
index 3338c46c04ef..a68917281466 100644
--- a/tests/panic/panic/unsupported_syscall.rs
+++ b/tests/panic/panic/unsupported_syscall.rs
@@ -1,5 +1,5 @@
-//@ignore-windows: No libc on Windows
-//@ignore-apple: `syscall` is not supported on macOS
+//@ignore-target-windows: No libc on Windows
+//@ignore-target-apple: `syscall` is not supported on macOS
 //@compile-flags: -Zmiri-panic-on-unsupported
 #![feature(rustc_private)]
 
diff --git a/tests/pass/0weak_memory_consistency.rs b/tests/pass/0weak_memory_consistency.rs
index 8b7ce50d2d42..b5b6b83cce1b 100644
--- a/tests/pass/0weak_memory_consistency.rs
+++ b/tests/pass/0weak_memory_consistency.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-ignore-leaks -Zmiri-disable-stacked-borrows
 
 // The following tests check whether our weak memory emulation produces
diff --git a/tests/pass/calloc.rs b/tests/pass/calloc.rs
index a75bb0606118..a9efb776b69e 100644
--- a/tests/pass/calloc.rs
+++ b/tests/pass/calloc.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/pass/concurrency/channels.rs b/tests/pass/concurrency/channels.rs
index e94c69b286d6..40d729f042d1 100644
--- a/tests/pass/concurrency/channels.rs
+++ b/tests/pass/concurrency/channels.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-strict-provenance
 
 use std::sync::mpsc::{channel, sync_channel};
diff --git a/tests/pass/concurrency/concurrent_caller_location.rs b/tests/pass/concurrency/concurrent_caller_location.rs
index 6bd601abd56e..a07f6b13e6d7 100644
--- a/tests/pass/concurrency/concurrent_caller_location.rs
+++ b/tests/pass/concurrency/concurrent_caller_location.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::panic::Location;
 use std::thread::spawn;
diff --git a/tests/pass/concurrency/data_race.rs b/tests/pass/concurrency/data_race.rs
index 69b6c53a2b79..5d1e1bb266ca 100644
--- a/tests/pass/concurrency/data_race.rs
+++ b/tests/pass/concurrency/data_race.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-weak-memory-emulation
 
 use std::sync::atomic::{fence, AtomicUsize, Ordering};
diff --git a/tests/pass/concurrency/disable_data_race_detector.rs b/tests/pass/concurrency/disable_data_race_detector.rs
index a3c1e4621a3a..a4852b4674e8 100644
--- a/tests/pass/concurrency/disable_data_race_detector.rs
+++ b/tests/pass/concurrency/disable_data_race_detector.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-data-race-detector
 
 use std::thread::spawn;
diff --git a/tests/pass/concurrency/issue1643.rs b/tests/pass/concurrency/issue1643.rs
index cfe9cf4cc2f7..f4fe43d88cb1 100644
--- a/tests/pass/concurrency/issue1643.rs
+++ b/tests/pass/concurrency/issue1643.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::thread::spawn;
 
diff --git a/tests/pass/concurrency/libc_pthread_cond.rs b/tests/pass/concurrency/libc_pthread_cond.rs
index 8d245e2f8ddd..eb491486be70 100644
--- a/tests/pass/concurrency/libc_pthread_cond.rs
+++ b/tests/pass/concurrency/libc_pthread_cond.rs
@@ -1,5 +1,5 @@
-//@ignore-windows: No libc on Windows
-//@ignore-apple: pthread_condattr_setclock is not supported on MacOS.
+//@ignore-target-windows: No libc on Windows
+//@ignore-target-apple: pthread_condattr_setclock is not supported on MacOS.
 //@compile-flags: -Zmiri-disable-isolation
 
 #![feature(rustc_private)]
diff --git a/tests/pass/concurrency/linux-futex.rs b/tests/pass/concurrency/linux-futex.rs
index 1ec0ec599f7b..f9c87e0723c5 100644
--- a/tests/pass/concurrency/linux-futex.rs
+++ b/tests/pass/concurrency/linux-futex.rs
@@ -1,4 +1,4 @@
-//@only-linux
+//@only-target-linux
 //@compile-flags: -Zmiri-disable-isolation
 
 #![feature(rustc_private)]
diff --git a/tests/pass/concurrency/simple.rs b/tests/pass/concurrency/simple.rs
index ac268dab5e94..1d85c7fc9bd0 100644
--- a/tests/pass/concurrency/simple.rs
+++ b/tests/pass/concurrency/simple.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-strict-provenance
 
 use std::thread;
diff --git a/tests/pass/concurrency/spin_loop.rs b/tests/pass/concurrency/spin_loop.rs
index e1c472589904..5f34168dbb1e 100644
--- a/tests/pass/concurrency/spin_loop.rs
+++ b/tests/pass/concurrency/spin_loop.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::thread;
 
diff --git a/tests/pass/concurrency/spin_loops_nopreempt.rs b/tests/pass/concurrency/spin_loops_nopreempt.rs
index 823d2ec76540..34be0dd39481 100644
--- a/tests/pass/concurrency/spin_loops_nopreempt.rs
+++ b/tests/pass/concurrency/spin_loops_nopreempt.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 // This specifically tests behavior *without* preemption.
 //@compile-flags: -Zmiri-preemption-rate=0
 
diff --git a/tests/pass/concurrency/sync.rs b/tests/pass/concurrency/sync.rs
index 64bd7ebb27fd..268153b612ae 100644
--- a/tests/pass/concurrency/sync.rs
+++ b/tests/pass/concurrency/sync.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-strict-provenance
 
 use std::sync::{Arc, Barrier, Condvar, Mutex, Once, RwLock};
diff --git a/tests/pass/concurrency/sync_nopreempt.rs b/tests/pass/concurrency/sync_nopreempt.rs
index e6ee4fe594f1..a53f143fef67 100644
--- a/tests/pass/concurrency/sync_nopreempt.rs
+++ b/tests/pass/concurrency/sync_nopreempt.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 // We are making scheduler assumptions here.
 //@compile-flags: -Zmiri-strict-provenance -Zmiri-preemption-rate=0
 
diff --git a/tests/pass/concurrency/thread_locals.rs b/tests/pass/concurrency/thread_locals.rs
index 82ce61d958d8..34431def33f8 100644
--- a/tests/pass/concurrency/thread_locals.rs
+++ b/tests/pass/concurrency/thread_locals.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-strict-provenance
 
 //! The main purpose of this test is to check that if we take a pointer to
diff --git a/tests/pass/concurrency/tls_lib_drop.rs b/tests/pass/concurrency/tls_lib_drop.rs
index 74ba8ee76207..6c66cd3a62fb 100644
--- a/tests/pass/concurrency/tls_lib_drop.rs
+++ b/tests/pass/concurrency/tls_lib_drop.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 
 use std::cell::RefCell;
 use std::thread;
diff --git a/tests/pass/concurrency/tls_pthread_drop_order.rs b/tests/pass/concurrency/tls_pthread_drop_order.rs
index b265e7da0b25..c9e8b9271ccf 100644
--- a/tests/pass/concurrency/tls_pthread_drop_order.rs
+++ b/tests/pass/concurrency/tls_pthread_drop_order.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 extern crate libc;
diff --git a/tests/pass/fs.rs b/tests/pass/fs.rs
index ced7831568e7..aa5cd83c69cd 100644
--- a/tests/pass/fs.rs
+++ b/tests/pass/fs.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: File handling is not implemented yet
+//@ignore-target-windows: File handling is not implemented yet
 //@compile-flags: -Zmiri-disable-isolation
 
 #![feature(rustc_private)]
diff --git a/tests/pass/fs_with_isolation.rs b/tests/pass/fs_with_isolation.rs
index 719882702cdd..41ada94e276e 100644
--- a/tests/pass/fs_with_isolation.rs
+++ b/tests/pass/fs_with_isolation.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: File handling is not implemented yet
+//@ignore-target-windows: File handling is not implemented yet
 //@compile-flags: -Zmiri-isolation-error=warn-nobacktrace
 //@normalize-stderr-test: "(stat(x)?)" -> "$$STAT"
 
diff --git a/tests/pass/libc.rs b/tests/pass/libc.rs
index 53c85d2b07d1..486ae4b3cfae 100644
--- a/tests/pass/libc.rs
+++ b/tests/pass/libc.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 //@compile-flags: -Zmiri-disable-isolation
 
 #![feature(rustc_private)]
diff --git a/tests/pass/linux-getrandom-without-isolation.rs b/tests/pass/linux-getrandom-without-isolation.rs
index 90e054533c14..fea3bb3fdce9 100644
--- a/tests/pass/linux-getrandom-without-isolation.rs
+++ b/tests/pass/linux-getrandom-without-isolation.rs
@@ -1,4 +1,4 @@
-//@only-linux
+//@only-target-linux
 //@compile-flags: -Zmiri-disable-isolation
 #![feature(rustc_private)]
 extern crate libc;
diff --git a/tests/pass/linux-getrandom.rs b/tests/pass/linux-getrandom.rs
index 70c106f6460a..1d0ab6ed746a 100644
--- a/tests/pass/linux-getrandom.rs
+++ b/tests/pass/linux-getrandom.rs
@@ -1,4 +1,4 @@
-//@only-linux
+//@only-target-linux
 #![feature(rustc_private)]
 extern crate libc;
 
diff --git a/tests/pass/malloc.rs b/tests/pass/malloc.rs
index c0a6a89fbed0..d20ceddbb8ed 100644
--- a/tests/pass/malloc.rs
+++ b/tests/pass/malloc.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: No libc on Windows
+//@ignore-target-windows: No libc on Windows
 
 #![feature(rustc_private)]
 
diff --git a/tests/pass/no_std.rs b/tests/pass/no_std.rs
index d8a462daf5a9..10632c2cce49 100644
--- a/tests/pass/no_std.rs
+++ b/tests/pass/no_std.rs
@@ -3,7 +3,7 @@
 // windows tls dtors go through libstd right now, thus this test
 // cannot pass. When windows tls dtors go through the special magic
 // windows linker section, we can run this test on windows again.
-//@ignore-windows
+//@ignore-target-windows
 
 #[start]
 fn start(_: isize, _: *const *const u8) -> isize {
diff --git a/tests/pass/panic/concurrent-panic.rs b/tests/pass/panic/concurrent-panic.rs
index 1231760865fb..1acae69b8d3b 100644
--- a/tests/pass/panic/concurrent-panic.rs
+++ b/tests/pass/panic/concurrent-panic.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 // We are making scheduler assumptions here.
 //@compile-flags: -Zmiri-preemption-rate=0
 
diff --git a/tests/pass/threadleak_ignored.rs b/tests/pass/threadleak_ignored.rs
index 2ba0b453ff39..077d8d083753 100644
--- a/tests/pass/threadleak_ignored.rs
+++ b/tests/pass/threadleak_ignored.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 // FIXME: disallow preemption to work around https://github.com/rust-lang/rust/issues/55005
 //@compile-flags: -Zmiri-ignore-leaks -Zmiri-preemption-rate=0
 
diff --git a/tests/pass/weak_memory/extra_cpp.rs b/tests/pass/weak_memory/extra_cpp.rs
index 61ba1ab92248..52c13cbdced3 100644
--- a/tests/pass/weak_memory/extra_cpp.rs
+++ b/tests/pass/weak_memory/extra_cpp.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-ignore-leaks
 
 // Tests operations not perfomable through C++'s atomic API
diff --git a/tests/pass/weak_memory/extra_cpp_unsafe.rs b/tests/pass/weak_memory/extra_cpp_unsafe.rs
index 0aff70ab7b78..1c6c370ced3b 100644
--- a/tests/pass/weak_memory/extra_cpp_unsafe.rs
+++ b/tests/pass/weak_memory/extra_cpp_unsafe.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-ignore-leaks
 
 // Tests operations not perfomable through C++'s atomic API
diff --git a/tests/pass/weak_memory/weak.rs b/tests/pass/weak_memory/weak.rs
index 71d57dd11ec7..dc7982991b69 100644
--- a/tests/pass/weak_memory/weak.rs
+++ b/tests/pass/weak_memory/weak.rs
@@ -1,4 +1,4 @@
-//@ignore-windows: Concurrency on Windows is not supported yet.
+//@ignore-target-windows: Concurrency on Windows is not supported yet.
 //@compile-flags: -Zmiri-ignore-leaks -Zmiri-preemption-rate=0
 
 // Tests showing weak memory behaviours are exhibited. All tests
diff --git a/tests/pass/wtf8.rs b/tests/pass/wtf8.rs
index bf23f65c7f0c..be8348654a32 100644
--- a/tests/pass/wtf8.rs
+++ b/tests/pass/wtf8.rs
@@ -1,4 +1,4 @@
-//@only-windows
+//@only-target-windows
 
 use std::ffi::{OsStr, OsString};
 use std::os::windows::ffi::{OsStrExt, OsStringExt};
diff --git a/ui_test/src/parser.rs b/ui_test/src/parser.rs
index e7fb484434d7..528486268877 100644
--- a/ui_test/src/parser.rs
+++ b/ui_test/src/parser.rs
@@ -65,16 +65,18 @@ pub(crate) struct ErrorMatch {
 }
 
 impl Condition {
-    fn parse(c: &str) -> Self {
+    fn parse(c: &str) -> Result<Self> {
         if c == "on-host" {
-            Condition::OnHost
+            Ok(Condition::OnHost)
         } else if let Some(bits) = c.strip_suffix("bit") {
             let bits: u8 = bits.parse().expect(
                 "ignore/only filter ending in 'bit' must be of the form 'Nbit' for some integer N",
             );
-            Condition::Bitwidth(bits)
+            Ok(Condition::Bitwidth(bits))
+        } else if let Some(target) = c.strip_prefix("target-") {
+            Ok(Condition::Target(target.to_owned()))
         } else {
-            Condition::Target(c.to_owned())
+            Err(eyre!("invalid ignore/only condition {c:?}"))
         }
     }
 }
@@ -211,13 +213,13 @@ fn parse_str(s: &str) -> Result<(&str, &str)> {
             command => {
                 if let Some(s) = command.strip_prefix("ignore-") {
                     // args are ignored (can be sue as comment)
-                    self.ignore.push(Condition::parse(s));
+                    self.ignore.push(Condition::parse(s)?);
                     return Ok(());
                 }
 
                 if let Some(s) = command.strip_prefix("only-") {
                     // args are ignored (can be sue as comment)
-                    self.only.push(Condition::parse(s));
+                    self.only.push(Condition::parse(s)?);
                     return Ok(());
                 }
                 bail!("unknown command {command}");