Skip to content

Commit 793af86

Browse files
joboetjoboet
committed
bless miri tests
1 parent 474d08a commit 793af86

12 files changed

+24
-24
lines changed

‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LL | assert_eq!(libc::pthread_mutex_lock(lock_copy.0.get() as *mut _
88
= note: inside closure at tests/fail-dep/concurrency/libc_pthread_mutex_deadlock.rs:LL:CC
99

1010
error: the evaluated program deadlocked
11-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
11+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1212
|
1313
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1414
| ^ this thread got stuck here
1515
|
1616
= note: BACKTRACE:
17-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
17+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1818
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1919
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
note: inside `main`

‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LL | assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
88
= note: inside closure at tests/fail-dep/concurrency/libc_pthread_rwlock_write_read_deadlock.rs:LL:CC
99

1010
error: the evaluated program deadlocked
11-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
11+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1212
|
1313
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1414
| ^ this thread got stuck here
1515
|
1616
= note: BACKTRACE:
17-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
17+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1818
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1919
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
note: inside `main`

‎src/tools/miri/tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LL | assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
88
= note: inside closure at tests/fail-dep/concurrency/libc_pthread_rwlock_write_write_deadlock.rs:LL:CC
99

1010
error: the evaluated program deadlocked
11-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
11+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1212
|
1313
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1414
| ^ this thread got stuck here
1515
|
1616
= note: BACKTRACE:
17-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
17+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1818
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1919
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
note: inside `main`

‎src/tools/miri/tests/fail-dep/concurrency/windows_join_detached.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: Undefined Behavior: trying to join a detached thread
2-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
2+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
33
|
44
LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(), c::INFINITE) };
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
10+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1111
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1212
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1313
note: inside `main`

‎src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ LL | assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_OBJ
99
= note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
1010

1111
error: the evaluated program deadlocked
12-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
12+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1313
|
1414
LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(), c::INFINITE) };
1515
| ^ this thread got stuck here
1616
|
1717
= note: BACKTRACE:
18-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
18+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1919
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2121
note: inside `main`

‎src/tools/miri/tests/fail-dep/concurrency/windows_join_self.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ LL | assert_eq!(WaitForSingleObject(native, INFINITE), WAIT_OBJECT_0
88
= note: inside closure at tests/fail-dep/concurrency/windows_join_self.rs:LL:CC
99

1010
error: the evaluated program deadlocked
11-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
11+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1212
|
1313
LL | let rc = unsafe { c::WaitForSingleObject(self.handle.as_raw_handle(), c::INFINITE) };
1414
| ^ this thread got stuck here
1515
|
1616
= note: BACKTRACE:
17-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
17+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1818
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1919
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
2020
note: inside `main`

‎src/tools/miri/tests/fail-dep/libc/eventfd_block_read_twice.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: the evaluated program deadlocked
2-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
2+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
33
|
44
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
55
| ^ this thread got stuck here
66
|
77
= note: BACKTRACE:
8-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
8+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
99
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1010
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1111
note: inside `main`

‎src/tools/miri/tests/fail-dep/libc/eventfd_block_write_twice.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: the evaluated program deadlocked
2-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
2+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
33
|
44
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
55
| ^ this thread got stuck here
66
|
77
= note: BACKTRACE:
8-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
8+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
99
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1010
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1111
note: inside `main`

‎src/tools/miri/tests/fail-dep/libc/libc_epoll_block_two_thread.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ error: the evaluated program deadlocked
55
= note: BACKTRACE on thread `unnamed-ID`:
66

77
error: the evaluated program deadlocked
8-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
8+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
99
|
1010
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
1111
| ^ this thread got stuck here
1212
|
1313
= note: BACKTRACE:
14-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
14+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
1515
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1616
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1717
note: inside `main`

‎src/tools/miri/tests/fail-dep/libc/socketpair-close-while-blocked.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: the evaluated program deadlocked
2-
--> RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
2+
--> RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
33
|
44
LL | let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };
55
| ^ this thread got stuck here
66
|
77
= note: BACKTRACE:
8-
= note: inside `std::sys::pal::PLATFORM::thread::Thread::join` at RUSTLIB/std/src/sys/pal/PLATFORM/thread.rs:LL:CC
8+
= note: inside `std::sys::thread::PLATFORM::Thread::join` at RUSTLIB/std/src/sys/thread/PLATFORM.rs:LL:CC
99
= note: inside `std::thread::JoinInner::<'_, ()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1010
= note: inside `std::thread::JoinHandle::<()>::join` at RUSTLIB/std/src/thread/mod.rs:LL:CC
1111
note: inside `main`

0 commit comments

Comments
 (0)