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

organize libc tests into a proper folder, and run some of them on Windows

src/tools/miri/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

src/tools/miri/tests/fail-dep/concurrency/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
 

src/tools/miri/tests/fail-dep/concurrency/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

src/tools/miri/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.

src/tools/miri/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.
 

src/tools/miri/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.
 

src/tools/miri/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.
 

src/tools/miri/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.
 

src/tools/miri/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.
 

src/tools/miri/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.
 

src/tools/miri/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
 

src/tools/miri/tests/fail-dep/concurrency/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.
 

src/tools/miri/tests/fail-dep/concurrency/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;

src/tools/miri/tests/fail-dep/concurrency/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.
 

src/tools/miri/tests/fail-dep/concurrency/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 {

src/tools/miri/tests/fail-dep/concurrency/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
 

src/tools/miri/tests/fail-dep/concurrency/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 {

src/tools/miri/tests/fail-dep/concurrency/libc_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 {

src/tools/miri/tests/fail-dep/concurrency/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;

src/tools/miri/tests/fail-dep/concurrency/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
 

src/tools/miri/tests/fail-dep/concurrency/libc_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);

src/tools/miri/tests/fail-dep/concurrency/libc_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);

src/tools/miri/tests/fail-dep/concurrency/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
 

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_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);

src/tools/miri/tests/fail-dep/concurrency/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;

src/tools/miri/tests/fail-dep/concurrency/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);

src/tools/miri/tests/fail-dep/concurrency/libc_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;

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_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);

src/tools/miri/tests/fail-dep/concurrency/libc_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;

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_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);

src/tools/miri/tests/fail-dep/concurrency/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;

src/tools/miri/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;

src/tools/miri/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)

src/tools/miri/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];

src/tools/miri/tests/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() {

src/tools/miri/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];

src/tools/miri/tests/fail-dep/libc/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() {

src/tools/miri/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";

src/tools/miri/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.

src/tools/miri/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.

src/tools/miri/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.

src/tools/miri/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`.
 

src/tools/miri/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;

src/tools/miri/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)]
 

src/tools/miri/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)]
 

src/tools/miri/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() {

src/tools/miri/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);

src/tools/miri/tests/fail-dep/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() {

src/tools/miri/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
 

src/tools/miri/tests/pass-dep/calloc.rs

@@ -1,22 +0,0 @@
-//@ignore-target-windows: No libc on Windows
-
-use core::slice;
-
-fn main() {
-    unsafe {
-        let p1 = libc::calloc(0, 0);
-        assert!(p1.is_null());
-
-        let p2 = libc::calloc(20, 0);
-        assert!(p2.is_null());
-
-        let p3 = libc::calloc(0, 20);
-        assert!(p3.is_null());
-
-        let p4 = libc::calloc(4, 8);
-        assert!(!p4.is_null());
-        let slice = slice::from_raw_parts(p4 as *const u8, 4 * 8);
-        assert_eq!(&slice, &[0_u8; 4 * 8]);
-        libc::free(p4);
-    }
-}

src/tools/miri/tests/pass-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;

src/tools/miri/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
 

src/tools/miri/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

src/tools/miri/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

src/tools/miri/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"]