Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 4d6d9a9

Browse files
borsbors
committed
Auto merge of rust-lang#3579 - RalfJung:libc, r=RalfJung
organize libc tests into a proper folder, and run some of them on Windows
2 parents 3d269e9 + dd5437f commit 4d6d9a9

File tree

109 files changed

+211
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+211
-208
lines changed

‎src/tools/miri/ci/ci.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ case $HOST_TARGET in
143143
# Partially supported targets (tier 2)
144144
VERY_BASIC="integer vec string btreemap" # common things we test on all of them (if they have std), requires no target-specific shims
145145
BASIC="$VERY_BASIC hello hashmap alloc align" # ensures we have the shims for stdout and basic data structures
146-
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
147-
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
148-
MIRI_TEST_TARGET=x86_64-unknown-illumos run_tests_minimal $VERY_BASIC hello panic/panic concurrency/simple pthread-sync libc-misc libc-random
149-
MIRI_TEST_TARGET=x86_64-pc-solaris run_tests_minimal $VERY_BASIC hello panic/panic concurrency/simple pthread-sync libc-misc libc-random
146+
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
147+
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
148+
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
149+
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
150150
MIRI_TEST_TARGET=aarch64-linux-android run_tests_minimal $VERY_BASIC hello panic/panic
151151
MIRI_TEST_TARGET=wasm32-wasi run_tests_minimal $VERY_BASIC wasm
152152
MIRI_TEST_TARGET=wasm32-unknown-unknown run_tests_minimal $VERY_BASIC wasm

‎src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_cond_double_destroy.rs renamed to ‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows: No libc on Windows
1+
//@ignore-target-windows: No pthreads on Windows
22

33
/// Test that destroying a pthread_cond twice fails, even without a check for number validity
44

‎src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_cond_double_destroy.stderr renamed to ‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.stderr

File renamed without changes.

‎src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_condattr_double_destroy.rs renamed to ‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows: No libc on Windows
1+
//@ignore-target-windows: No pthreads on Windows
22
//@ignore-target-apple: Our macOS condattr don't have any fields so we do not notice this.
33

44
/// Test that destroying a pthread_condattr twice fails, even without a check for number validity

‎src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_condattr_double_destroy.stderr renamed to ‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.stderr

File renamed without changes.

‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_create_main_terminate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows: No libc on Windows
1+
//@ignore-target-windows: No pthreads on Windows
22
//@error-in-other-file: the main thread terminated without waiting for all remaining threads
33

44
// 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows: No libc on Windows
1+
//@ignore-target-windows: No pthreads on Windows
22

33
//! The thread function must have exactly one argument.
44

‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_create_too_many_args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows: No libc on Windows
1+
//@ignore-target-windows: No pthreads on Windows
22

33
//! The thread function must have exactly one argument.
44

‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_detached.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows: No libc on Windows
1+
//@ignore-target-windows: No pthreads on Windows
22

33
// Joining a detached thread is undefined behavior.
44

‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_joined.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ignore-target-windows: No libc on Windows
1+
//@ignore-target-windows: No pthreads on Windows
22

33
// Joining an already joined thread is undefined behavior.
44

0 commit comments

Comments
 (0)