Auto merge of #3579 - RalfJung:libc, r=RalfJung

organize libc tests into a proper folder, and run some of them on Windows
rust-lang · May 6, 2024 · cf2df2d · cf2df2d
2 parents edcdce0 + 325af11
commit cf2df2d
Show file tree

Hide file tree

Showing 109 changed files with 211 additions and 208 deletions.
diff --git a/ci/ci.sh b/ci/ci.sh
@@ -143,10 +143,10 @@ case $HOST_TARGET in
     # Partially supported targets (tier 2)
     VERY_BASIC="integer vec string btreemap" # common things we test on all of them (if they have std), requires no target-specific shims
     BASIC="$VERY_BASIC hello hashmap alloc align" # ensures we have the shims for stdout and basic data structures
-    MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal $BASIC panic/panic concurrency/simple atomic threadname libc-misc libc-random libc-time fs env num_cpus
-    MIRI_TEST_TARGET=i686-unknown-freebsd   run_tests_minimal $BASIC panic/panic concurrency/simple atomic threadname libc-misc libc-random libc-time fs env num_cpus
-    MIRI_TEST_TARGET=x86_64-unknown-illumos run_tests_minimal $VERY_BASIC hello panic/panic concurrency/simple pthread-sync libc-misc libc-random
-    MIRI_TEST_TARGET=x86_64-pc-solaris run_tests_minimal $VERY_BASIC hello panic/panic concurrency/simple pthread-sync libc-misc libc-random
+    MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal $BASIC panic/panic concurrency/simple atomic threadname libc-mem libc-misc libc-random libc-time fs env num_cpus
+    MIRI_TEST_TARGET=i686-unknown-freebsd   run_tests_minimal $BASIC panic/panic concurrency/simple atomic threadname libc-mem libc-misc libc-random libc-time fs env num_cpus
+    MIRI_TEST_TARGET=x86_64-unknown-illumos run_tests_minimal $VERY_BASIC hello panic/panic concurrency/simple pthread-sync libc-mem libc-misc libc-random
+    MIRI_TEST_TARGET=x86_64-pc-solaris run_tests_minimal $VERY_BASIC hello panic/panic concurrency/simple pthread-sync libc-mem libc-misc libc-random
     MIRI_TEST_TARGET=aarch64-linux-android  run_tests_minimal $VERY_BASIC hello panic/panic
     MIRI_TEST_TARGET=wasm32-wasi run_tests_minimal $VERY_BASIC wasm
     MIRI_TEST_TARGET=wasm32-unknown-unknown run_tests_minimal $VERY_BASIC wasm

diff --git a/.../sync/libc_pthread_cond_double_destroy.rs → ...rency/libc_pthread_cond_double_destroy.rs b/.../sync/libc_pthread_cond_double_destroy.rs → ...rency/libc_pthread_cond_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 /// Test that destroying a pthread_cond twice fails, even without a check for number validity
 

diff --git a/...c/libc_pthread_cond_double_destroy.stderr → ...y/libc_pthread_cond_double_destroy.stderr b/...c/libc_pthread_cond_double_destroy.stderr → ...y/libc_pthread_cond_double_destroy.stderr
diff --git a/...c/libc_pthread_condattr_double_destroy.rs → ...y/libc_pthread_condattr_double_destroy.rs b/...c/libc_pthread_condattr_double_destroy.rs → ...y/libc_pthread_condattr_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //@ignore-target-apple: Our macOS condattr don't have any fields so we do not notice this.
 
 /// Test that destroying a pthread_condattr twice fails, even without a check for number validity

diff --git a/...bc_pthread_condattr_double_destroy.stderr → ...bc_pthread_condattr_double_destroy.stderr b/...bc_pthread_condattr_double_destroy.stderr → ...bc_pthread_condattr_double_destroy.stderr
diff --git a/tests/fail-dep/concurrency/libc_pthread_create_main_terminate.rs b/tests/fail-dep/concurrency/libc_pthread_create_main_terminate.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //@error-in-other-file: 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-dep/concurrency/libc_pthread_create_too_few_args.rs b/tests/fail-dep/concurrency/libc_pthread_create_too_few_args.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 //! The thread function must have exactly one argument.
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_create_too_many_args.rs b/tests/fail-dep/concurrency/libc_pthread_create_too_many_args.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 //! The thread function must have exactly one argument.
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_join_detached.rs b/tests/fail-dep/concurrency/libc_pthread_join_detached.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 // Joining a detached thread is undefined behavior.
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_join_joined.rs b/tests/fail-dep/concurrency/libc_pthread_join_joined.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 // Joining an already joined thread is undefined behavior.
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_join_main.rs b/tests/fail-dep/concurrency/libc_pthread_join_main.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 // Joining the main thread is undefined behavior.
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_join_multiple.rs b/tests/fail-dep/concurrency/libc_pthread_join_multiple.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 // Joining the same thread from multiple threads is undefined behavior.
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_join_self.rs b/tests/fail-dep/concurrency/libc_pthread_join_self.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 // We are making scheduler assumptions here.
 //@compile-flags: -Zmiri-preemption-rate=0
 

diff --git a/.../sync/libc_pthread_mutex_NULL_deadlock.rs → ...rency/libc_pthread_mutex_NULL_deadlock.rs b/.../sync/libc_pthread_mutex_NULL_deadlock.rs → ...rency/libc_pthread_mutex_NULL_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //
 // Check that if we pass NULL attribute, then we get the default mutex type.
 

diff --git a/...c/libc_pthread_mutex_NULL_deadlock.stderr → ...y/libc_pthread_mutex_NULL_deadlock.stderr b/...c/libc_pthread_mutex_NULL_deadlock.stderr → ...y/libc_pthread_mutex_NULL_deadlock.stderr
diff --git a/...shims/sync/libc_pthread_mutex_deadlock.rs → ...oncurrency/libc_pthread_mutex_deadlock.rs b/...shims/sync/libc_pthread_mutex_deadlock.rs → ...oncurrency/libc_pthread_mutex_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //@error-in-other-file: deadlock
 
 use std::cell::UnsafeCell;

diff --git a/...s/sync/libc_pthread_mutex_deadlock.stderr → ...rrency/libc_pthread_mutex_deadlock.stderr b/...s/sync/libc_pthread_mutex_deadlock.stderr → ...rrency/libc_pthread_mutex_deadlock.stderr
diff --git a/...nc/libc_pthread_mutex_default_deadlock.rs → ...cy/libc_pthread_mutex_default_deadlock.rs b/...nc/libc_pthread_mutex_default_deadlock.rs → ...cy/libc_pthread_mutex_default_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //
 // Check that if we do not set the mutex type, it is the default.
 

diff --git a/...ibc_pthread_mutex_default_deadlock.stderr → ...ibc_pthread_mutex_default_deadlock.stderr b/...ibc_pthread_mutex_default_deadlock.stderr → ...ibc_pthread_mutex_default_deadlock.stderr
diff --git a/...sync/libc_pthread_mutex_destroy_locked.rs → ...ency/libc_pthread_mutex_destroy_locked.rs b/...sync/libc_pthread_mutex_destroy_locked.rs → ...ency/libc_pthread_mutex_destroy_locked.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 fn main() {
     unsafe {

diff --git a/.../libc_pthread_mutex_destroy_locked.stderr → .../libc_pthread_mutex_destroy_locked.stderr b/.../libc_pthread_mutex_destroy_locked.stderr → .../libc_pthread_mutex_destroy_locked.stderr
diff --git a/...sync/libc_pthread_mutex_double_destroy.rs → ...ency/libc_pthread_mutex_double_destroy.rs b/...sync/libc_pthread_mutex_double_destroy.rs → ...ency/libc_pthread_mutex_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 /// Test that destroying a pthread_mutex twice fails, even without a check for number validity
 

diff --git a/.../libc_pthread_mutex_double_destroy.stderr → .../libc_pthread_mutex_double_destroy.stderr b/.../libc_pthread_mutex_double_destroy.stderr → .../libc_pthread_mutex_double_destroy.stderr
diff --git a/...ync/libc_pthread_mutex_normal_deadlock.rs → ...ncy/libc_pthread_mutex_normal_deadlock.rs b/...ync/libc_pthread_mutex_normal_deadlock.rs → ...ncy/libc_pthread_mutex_normal_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 fn main() {
     unsafe {

diff --git a/...libc_pthread_mutex_normal_deadlock.stderr → ...libc_pthread_mutex_normal_deadlock.stderr b/...libc_pthread_mutex_normal_deadlock.stderr → ...libc_pthread_mutex_normal_deadlock.stderr
diff --git a/...c_pthread_mutex_normal_unlock_unlocked.rs → ...c_pthread_mutex_normal_unlock_unlocked.rs b/...c_pthread_mutex_normal_unlock_unlocked.rs → ...c_pthread_mutex_normal_unlock_unlocked.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 fn main() {
     unsafe {

diff --git a/...hread_mutex_normal_unlock_unlocked.stderr → ...hread_mutex_normal_unlock_unlocked.stderr b/...hread_mutex_normal_unlock_unlocked.stderr → ...hread_mutex_normal_unlock_unlocked.stderr
diff --git a/...ms/sync/libc_pthread_mutex_wrong_owner.rs → ...urrency/libc_pthread_mutex_wrong_owner.rs b/...ms/sync/libc_pthread_mutex_wrong_owner.rs → ...urrency/libc_pthread_mutex_wrong_owner.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 use std::cell::UnsafeCell;
 use std::sync::Arc;

diff --git a/...ync/libc_pthread_mutex_wrong_owner.stderr → ...ncy/libc_pthread_mutex_wrong_owner.stderr b/...ync/libc_pthread_mutex_wrong_owner.stderr → ...ncy/libc_pthread_mutex_wrong_owner.stderr
diff --git a/.../libc_pthread_mutexattr_double_destroy.rs → .../libc_pthread_mutexattr_double_destroy.rs b/.../libc_pthread_mutexattr_double_destroy.rs → .../libc_pthread_mutexattr_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 /// Test that destroying a pthread_mutexattr twice fails, even without a check for number validity
 

diff --git a/...c_pthread_mutexattr_double_destroy.stderr → ...c_pthread_mutexattr_double_destroy.stderr b/...c_pthread_mutexattr_double_destroy.stderr → ...c_pthread_mutexattr_double_destroy.stderr
diff --git a/...ibc_pthread_rwlock_destroy_read_locked.rs → ...ibc_pthread_rwlock_destroy_read_locked.rs b/...ibc_pthread_rwlock_destroy_read_locked.rs → ...ibc_pthread_rwlock_destroy_read_locked.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);

diff --git a/...pthread_rwlock_destroy_read_locked.stderr → ...pthread_rwlock_destroy_read_locked.stderr b/...pthread_rwlock_destroy_read_locked.stderr → ...pthread_rwlock_destroy_read_locked.stderr
diff --git a/...bc_pthread_rwlock_destroy_write_locked.rs → ...bc_pthread_rwlock_destroy_write_locked.rs b/...bc_pthread_rwlock_destroy_write_locked.rs → ...bc_pthread_rwlock_destroy_write_locked.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);

diff --git a/...thread_rwlock_destroy_write_locked.stderr → ...thread_rwlock_destroy_write_locked.stderr b/...thread_rwlock_destroy_write_locked.stderr → ...thread_rwlock_destroy_write_locked.stderr
diff --git a/...ync/libc_pthread_rwlock_double_destroy.rs → ...ncy/libc_pthread_rwlock_double_destroy.rs b/...ync/libc_pthread_rwlock_double_destroy.rs → ...ncy/libc_pthread_rwlock_double_destroy.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 /// Test that destroying a pthread_rwlock twice fails, even without a check for number validity
 

diff --git a/...libc_pthread_rwlock_double_destroy.stderr → ...libc_pthread_rwlock_double_destroy.stderr b/...libc_pthread_rwlock_double_destroy.stderr → ...libc_pthread_rwlock_double_destroy.stderr
diff --git a/...lock_read_write_deadlock_single_thread.rs → ...lock_read_write_deadlock_single_thread.rs b/...lock_read_write_deadlock_single_thread.rs → ...lock_read_write_deadlock_single_thread.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);

diff --git a/..._read_write_deadlock_single_thread.stderr → ..._read_write_deadlock_single_thread.stderr b/..._read_write_deadlock_single_thread.stderr → ..._read_write_deadlock_single_thread.stderr
diff --git a/...c/libc_pthread_rwlock_read_wrong_owner.rs → ...y/libc_pthread_rwlock_read_wrong_owner.rs b/...c/libc_pthread_rwlock_read_wrong_owner.rs → ...y/libc_pthread_rwlock_read_wrong_owner.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 use std::cell::UnsafeCell;
 use std::sync::Arc;

diff --git a/...bc_pthread_rwlock_read_wrong_owner.stderr → ...bc_pthread_rwlock_read_wrong_owner.stderr b/...bc_pthread_rwlock_read_wrong_owner.stderr → ...bc_pthread_rwlock_read_wrong_owner.stderr
diff --git a/...nc/libc_pthread_rwlock_unlock_unlocked.rs → ...cy/libc_pthread_rwlock_unlock_unlocked.rs b/...nc/libc_pthread_rwlock_unlock_unlocked.rs → ...cy/libc_pthread_rwlock_unlock_unlocked.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);

diff --git a/...ibc_pthread_rwlock_unlock_unlocked.stderr → ...ibc_pthread_rwlock_unlock_unlocked.stderr b/...ibc_pthread_rwlock_unlock_unlocked.stderr → ...ibc_pthread_rwlock_unlock_unlocked.stderr
diff --git a/...ibc_pthread_rwlock_write_read_deadlock.rs → ...ibc_pthread_rwlock_write_read_deadlock.rs b/...ibc_pthread_rwlock_write_read_deadlock.rs → ...ibc_pthread_rwlock_write_read_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //@error-in-other-file: deadlock
 
 use std::cell::UnsafeCell;

diff --git a/...pthread_rwlock_write_read_deadlock.stderr → ...pthread_rwlock_write_read_deadlock.stderr b/...pthread_rwlock_write_read_deadlock.stderr → ...pthread_rwlock_write_read_deadlock.stderr
diff --git a/...lock_write_read_deadlock_single_thread.rs → ...lock_write_read_deadlock_single_thread.rs b/...lock_write_read_deadlock_single_thread.rs → ...lock_write_read_deadlock_single_thread.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);

diff --git a/..._write_read_deadlock_single_thread.stderr → ..._write_read_deadlock_single_thread.stderr b/..._write_read_deadlock_single_thread.stderr → ..._write_read_deadlock_single_thread.stderr
diff --git a/...bc_pthread_rwlock_write_write_deadlock.rs → ...bc_pthread_rwlock_write_write_deadlock.rs b/...bc_pthread_rwlock_write_write_deadlock.rs → ...bc_pthread_rwlock_write_write_deadlock.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //@error-in-other-file: deadlock
 
 use std::cell::UnsafeCell;

diff --git a/...thread_rwlock_write_write_deadlock.stderr → ...thread_rwlock_write_write_deadlock.stderr b/...thread_rwlock_write_write_deadlock.stderr → ...thread_rwlock_write_write_deadlock.stderr
diff --git a/...ock_write_write_deadlock_single_thread.rs → ...ock_write_write_deadlock_single_thread.rs b/...ock_write_write_deadlock_single_thread.rs → ...ock_write_write_deadlock_single_thread.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 fn main() {
     let rw = std::cell::UnsafeCell::new(libc::PTHREAD_RWLOCK_INITIALIZER);

diff --git a/...write_write_deadlock_single_thread.stderr → ...write_write_deadlock_single_thread.stderr b/...write_write_deadlock_single_thread.stderr → ...write_write_deadlock_single_thread.stderr
diff --git a/.../libc_pthread_rwlock_write_wrong_owner.rs → .../libc_pthread_rwlock_write_wrong_owner.rs b/.../libc_pthread_rwlock_write_wrong_owner.rs → .../libc_pthread_rwlock_write_wrong_owner.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 
 use std::cell::UnsafeCell;
 use std::sync::Arc;

diff --git a/...c_pthread_rwlock_write_wrong_owner.stderr → ...c_pthread_rwlock_write_wrong_owner.stderr b/...c_pthread_rwlock_write_wrong_owner.stderr → ...c_pthread_rwlock_write_wrong_owner.stderr
diff --git a/...s/fail-dep/shims/env-set_var-data-race.rs → tests/fail-dep/libc/env-set_var-data-race.rs b/...s/fail-dep/shims/env-set_var-data-race.rs → tests/fail-dep/libc/env-set_var-data-race.rs
@@ -1,5 +1,5 @@
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-preemption-rate=0
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No libc env support on Windows
 
 use std::env;
 use std::thread;

diff --git a/...il-dep/shims/env-set_var-data-race.stderr → ...ail-dep/libc/env-set_var-data-race.stderr b/...il-dep/shims/env-set_var-data-race.stderr → ...ail-dep/libc/env-set_var-data-race.stderr
diff --git a/tests/fail-dep/shims/fs/close_stdout.rs → tests/fail-dep/libc/fs/close_stdout.rs b/tests/fail-dep/shims/fs/close_stdout.rs → tests/fail-dep/libc/fs/close_stdout.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No libc IO 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-dep/shims/fs/close_stdout.stderr → tests/fail-dep/libc/fs/close_stdout.stderr b/tests/fail-dep/shims/fs/close_stdout.stderr → tests/fail-dep/libc/fs/close_stdout.stderr
diff --git a/tests/fail-dep/shims/fs/isolated_stdin.rs → tests/fail-dep/libc/fs/isolated_stdin.rs b/tests/fail-dep/shims/fs/isolated_stdin.rs → tests/fail-dep/libc/fs/isolated_stdin.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No libc IO on Windows
 
 fn main() -> std::io::Result<()> {
     let mut bytes = [0u8; 512];

diff --git a/...s/fail-dep/shims/fs/isolated_stdin.stderr → tests/fail-dep/libc/fs/isolated_stdin.stderr b/...s/fail-dep/shims/fs/isolated_stdin.stderr → tests/fail-dep/libc/fs/isolated_stdin.stderr
diff --git a/...ail-dep/shims/fs/mkstemp_immutable_arg.rs → ...fail-dep/libc/fs/mkstemp_immutable_arg.rs b/...ail-dep/shims/fs/mkstemp_immutable_arg.rs → ...fail-dep/libc/fs/mkstemp_immutable_arg.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No mkstemp on Windows
 //@compile-flags: -Zmiri-disable-isolation
 
 fn main() {

diff --git a/...dep/shims/fs/mkstemp_immutable_arg.stderr → ...-dep/libc/fs/mkstemp_immutable_arg.stderr b/...dep/shims/fs/mkstemp_immutable_arg.stderr → ...-dep/libc/fs/mkstemp_immutable_arg.stderr
diff --git a/tests/fail-dep/shims/fs/read_from_stdout.rs → tests/fail-dep/libc/fs/read_from_stdout.rs b/tests/fail-dep/shims/fs/read_from_stdout.rs → tests/fail-dep/libc/fs/read_from_stdout.rs
@@ -1,5 +1,5 @@
 //@compile-flags: -Zmiri-disable-isolation
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No libc IO on Windows
 
 fn main() -> std::io::Result<()> {
     let mut bytes = [0u8; 512];

diff --git a/...fail-dep/shims/fs/read_from_stdout.stderr → .../fail-dep/libc/fs/read_from_stdout.stderr b/...fail-dep/shims/fs/read_from_stdout.stderr → .../fail-dep/libc/fs/read_from_stdout.stderr
diff --git a/...ims/fs/unix_open_missing_required_mode.rs → ...ibc/fs/unix_open_missing_required_mode.rs b/...ims/fs/unix_open_missing_required_mode.rs → ...ibc/fs/unix_open_missing_required_mode.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No libc IO on Windows
 //@compile-flags: -Zmiri-disable-isolation
 
 fn main() {

diff --git a/...fs/unix_open_missing_required_mode.stderr → ...fs/unix_open_missing_required_mode.stderr b/...fs/unix_open_missing_required_mode.stderr → ...fs/unix_open_missing_required_mode.stderr
diff --git a/tests/fail-dep/shims/fs/write_to_stdin.rs → tests/fail-dep/libc/fs/write_to_stdin.rs b/tests/fail-dep/shims/fs/write_to_stdin.rs → tests/fail-dep/libc/fs/write_to_stdin.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No libc IO on Windows
 
 fn main() -> std::io::Result<()> {
     let bytes = b"hello";

diff --git a/...s/fail-dep/shims/fs/write_to_stdin.stderr → tests/fail-dep/libc/fs/write_to_stdin.stderr b/...s/fail-dep/shims/fs/write_to_stdin.stderr → tests/fail-dep/libc/fs/write_to_stdin.stderr
diff --git a/tests/fail-dep/shims/memchr_null.rs → tests/fail-dep/libc/memchr_null.rs b/tests/fail-dep/shims/memchr_null.rs → tests/fail-dep/libc/memchr_null.rs
@@ -1,5 +1,3 @@
-//@ignore-target-windows: No libc on Windows
-
 use std::ptr;
 
 // null is explicitly called out as UB in the C docs.

diff --git a/tests/fail-dep/shims/memchr_null.stderr → tests/fail-dep/libc/memchr_null.stderr b/tests/fail-dep/shims/memchr_null.stderr → tests/fail-dep/libc/memchr_null.stderr
diff --git a/tests/fail-dep/shims/memcmp_null.rs → tests/fail-dep/libc/memcmp_null.rs b/tests/fail-dep/shims/memcmp_null.rs → tests/fail-dep/libc/memcmp_null.rs
@@ -1,5 +1,3 @@
-//@ignore-target-windows: No libc on Windows
-
 use std::ptr;
 
 // null is explicitly called out as UB in the C docs.

diff --git a/tests/fail-dep/shims/memcmp_null.stderr → tests/fail-dep/libc/memcmp_null.stderr b/tests/fail-dep/shims/memcmp_null.stderr → tests/fail-dep/libc/memcmp_null.stderr
diff --git a/tests/fail-dep/shims/memcmp_zero.rs → tests/fail-dep/libc/memcmp_zero.rs b/tests/fail-dep/shims/memcmp_zero.rs → tests/fail-dep/libc/memcmp_zero.rs
@@ -1,4 +1,3 @@
-//@ignore-target-windows: No libc on Windows
 //@compile-flags: -Zmiri-permissive-provenance
 
 // C says that passing "invalid" pointers is UB for all string functions.

diff --git a/tests/fail-dep/shims/memcmp_zero.stderr → tests/fail-dep/libc/memcmp_zero.stderr b/tests/fail-dep/shims/memcmp_zero.stderr → tests/fail-dep/libc/memcmp_zero.stderr
diff --git a/tests/fail-dep/shims/memcpy_zero.rs → tests/fail-dep/libc/memcpy_zero.rs b/tests/fail-dep/shims/memcpy_zero.rs → tests/fail-dep/libc/memcpy_zero.rs
@@ -1,4 +1,3 @@
-//@ignore-target-windows: No libc on Windows
 //@compile-flags: -Zmiri-permissive-provenance
 // C's memcpy is 0 bytes is UB for some pointers that are allowed in Rust's `copy_nonoverlapping`.
 

diff --git a/tests/fail-dep/shims/memcpy_zero.stderr → tests/fail-dep/libc/memcpy_zero.stderr b/tests/fail-dep/shims/memcpy_zero.stderr → tests/fail-dep/libc/memcpy_zero.stderr
diff --git a/tests/fail-dep/shims/memrchr_null.rs → tests/fail-dep/libc/memrchr_null.rs b/tests/fail-dep/shims/memrchr_null.rs → tests/fail-dep/libc/memrchr_null.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No `memrchr` on Windows
 //@ignore-target-apple: No `memrchr` on some apple targets
 
 use std::ptr;

diff --git a/tests/fail-dep/shims/memrchr_null.stderr → tests/fail-dep/libc/memrchr_null.stderr b/tests/fail-dep/shims/memrchr_null.stderr → tests/fail-dep/libc/memrchr_null.stderr
diff --git a/tests/fail-dep/shims/mmap_invalid_dealloc.rs → tests/fail-dep/libc/mmap_invalid_dealloc.rs b/tests/fail-dep/shims/mmap_invalid_dealloc.rs → tests/fail-dep/libc/mmap_invalid_dealloc.rs
@@ -1,5 +1,5 @@
 //@compile-flags: -Zmiri-disable-isolation
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No mmap on Windows
 
 #![feature(rustc_private)]
 

diff --git a/...ail-dep/shims/mmap_invalid_dealloc.stderr → ...fail-dep/libc/mmap_invalid_dealloc.stderr b/...ail-dep/shims/mmap_invalid_dealloc.stderr → ...fail-dep/libc/mmap_invalid_dealloc.stderr
diff --git a/...s/fail-dep/shims/mmap_use_after_munmap.rs → tests/fail-dep/libc/mmap_use_after_munmap.rs b/...s/fail-dep/shims/mmap_use_after_munmap.rs → tests/fail-dep/libc/mmap_use_after_munmap.rs
@@ -1,5 +1,5 @@
 //@compile-flags: -Zmiri-disable-isolation
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No mmap on Windows
 
 #![feature(rustc_private)]
 

diff --git a/...il-dep/shims/mmap_use_after_munmap.stderr → ...ail-dep/libc/mmap_use_after_munmap.stderr b/...il-dep/shims/mmap_use_after_munmap.stderr → ...ail-dep/libc/mmap_use_after_munmap.stderr
diff --git a/tests/fail-dep/shims/munmap_partial.rs → tests/fail-dep/libc/munmap_partial.rs b/tests/fail-dep/shims/munmap_partial.rs → tests/fail-dep/libc/munmap_partial.rs
@@ -1,7 +1,7 @@
 //! The man pages for mmap/munmap suggest that it is possible to partly unmap a previously-mapped
 //! region of address space, but to LLVM that would be partial deallocation, which LLVM does not
 //! support. So even though the man pages say this sort of use is possible, we must report UB.
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No mmap on Windows
 //@normalize-stderr-test: "size [0-9]+ and alignment" -> "size SIZE and alignment"
 
 fn main() {

diff --git a/tests/fail-dep/shims/munmap_partial.stderr → tests/fail-dep/libc/munmap_partial.stderr b/tests/fail-dep/shims/munmap_partial.stderr → tests/fail-dep/libc/munmap_partial.stderr
diff --git a/tests/fail-dep/realloc-zero.rs → tests/fail-dep/libc/realloc-zero.rs b/tests/fail-dep/realloc-zero.rs → tests/fail-dep/libc/realloc-zero.rs
@@ -1,5 +1,3 @@
-//@ignore-target-windows: No libc on Windows
-
 fn main() {
     unsafe {
         let p1 = libc::malloc(20);

diff --git a/tests/fail-dep/realloc-zero.stderr → tests/fail-dep/libc/realloc-zero.stderr b/tests/fail-dep/realloc-zero.stderr → tests/fail-dep/libc/realloc-zero.stderr
diff --git a/...il-dep/unsupported_incomplete_function.rs → ...p/libc/unsupported_incomplete_function.rs b/...il-dep/unsupported_incomplete_function.rs → ...p/libc/unsupported_incomplete_function.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-target-windows: No libc on Windows
+//@ignore-target-windows: No `libc::signal` on Windows
 //@normalize-stderr-test: "OS `.*`" -> "$$OS"
 
 fn main() {

diff --git a/...ep/unsupported_incomplete_function.stderr → ...bc/unsupported_incomplete_function.stderr b/...ep/unsupported_incomplete_function.stderr → ...bc/unsupported_incomplete_function.stderr
diff --git a/tests/panic/unsupported_syscall.rs b/tests/panic/unsupported_syscall.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: no `syscall` on Windows
 //@ignore-target-apple: `syscall` is not supported on macOS
 //@compile-flags: -Zmiri-panic-on-unsupported
 

diff --git a/tests/pass-dep/calloc.rs b/tests/pass-dep/calloc.rs
diff --git a/...s/pass-dep/shims/env-cleanup-data-race.rs → ...-dep/concurrency/env-cleanup-data-race.rs b/...s/pass-dep/shims/env-cleanup-data-race.rs → ...-dep/concurrency/env-cleanup-data-race.rs
@@ -1,5 +1,5 @@
 //@compile-flags: -Zmiri-disable-isolation -Zmiri-preemption-rate=0
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No libc env support on Windows
 
 use std::ffi::CStr;
 use std::thread;

diff --git a/tests/pass-dep/concurrency/libc_pthread_cond_timedwait.rs b/tests/pass-dep/concurrency/libc_pthread_cond_timedwait.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //@ignore-target-apple: pthread_condattr_setclock is not supported on MacOS.
 //@compile-flags: -Zmiri-disable-isolation
 

diff --git a/tests/pass-dep/concurrency/libc_pthread_cond_timedwait_isolated.rs b/tests/pass-dep/concurrency/libc_pthread_cond_timedwait_isolated.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //@ignore-target-apple: pthread_condattr_setclock is not supported on MacOS.
 
 /// Test that conditional variable timeouts are working properly

diff --git a/tests/pass-dep/concurrency/tls_pthread_drop_order.rs b/tests/pass-dep/concurrency/tls_pthread_drop_order.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No pthreads on Windows
 //! Test that pthread_key destructors are run in the right order.
 //! Note that these are *not* used by actual `thread_local!` on Linux! Those use
 //! `thread_local_dtor::register_dtor` from the stdlib instead. In Miri this hits the fallback path

diff --git a/tests/pass-dep/extra_fn_ptr_gc.rs b/tests/pass-dep/extra_fn_ptr_gc.rs
@@ -1,4 +1,4 @@
-//@ignore-target-windows: No libc on Windows
+//@ignore-target-windows: No `dlsym` on Windows
 //@compile-flags: -Zmiri-permissive-provenance
 
 #[path = "../utils/mod.rs"]

diff --git a/...pass-dep/shims/fcntl_f-fullfsync_apple.rs → .../pass-dep/libc/fcntl_f-fullfsync_apple.rs b/...pass-dep/shims/fcntl_f-fullfsync_apple.rs → .../pass-dep/libc/fcntl_f-fullfsync_apple.rs
diff --git a/...-dep/shims/fcntl_f-fullfsync_apple.stderr → ...s-dep/libc/fcntl_f-fullfsync_apple.stderr b/...-dep/shims/fcntl_f-fullfsync_apple.stderr → ...s-dep/libc/fcntl_f-fullfsync_apple.stderr
diff --git a/.../pass-dep/shims/libc-fs-with-isolation.rs → ...s/pass-dep/libc/libc-fs-with-isolation.rs b/.../pass-dep/shims/libc-fs-with-isolation.rs → ...s/pass-dep/libc/libc-fs-with-isolation.rs
diff --git a/...s-dep/shims/libc-fs-with-isolation.stderr → ...ss-dep/libc/libc-fs-with-isolation.stderr b/...s-dep/shims/libc-fs-with-isolation.stderr → ...ss-dep/libc/libc-fs-with-isolation.stderr
diff --git a/tests/pass-dep/shims/libc-fs.rs → tests/pass-dep/libc/libc-fs.rs b/tests/pass-dep/shims/libc-fs.rs → tests/pass-dep/libc/libc-fs.rs
diff --git a/tests/pass-dep/shims/libc-fs.stderr → tests/pass-dep/libc/libc-fs.stderr b/tests/pass-dep/shims/libc-fs.stderr → tests/pass-dep/libc/libc-fs.stderr
diff --git a/tests/pass-dep/shims/libc-fs.stdout → tests/pass-dep/libc/libc-fs.stdout b/tests/pass-dep/shims/libc-fs.stdout → tests/pass-dep/libc/libc-fs.stdout