user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make test work cross-platform

Browse source
This commit is contained in:
Ralf Jung 2023-06-16 12:17:33 +02:00
parent e2d22666e9
commit f3b52fdb74
4 changed files with 10 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tools/miri/tests/fail/panic/thread_local_const_drop_panic.rs
View file

@ -1,4 +1,9 @@
//@error-in-other-file: aborted execution
// Backtraces vary wildly between platforms, we have to normalize away almost the entire thing.
// Full backtraces avoid annoying empty line differences.
//@compile-flags: -Zmiri-backtrace=full
//@normalize-stderr-test: "'main'|'<unnamed>'" -> "$$NAME"
//@normalize-stderr-test: ".*(note|-->|\|).*\n" -> ""
pub struct NoisyDrop {}

22
src/tools/miri/tests/fail/panic/thread_local_const_drop_panic.stderr
View file

@ -1,26 +1,6 @@
thread '<unnamed>' panicked at 'ow', $DIR/thread_local_const_drop_panic.rs:LL:CC
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
thread $NAME panicked at 'ow', $DIR/thread_local_const_drop_panic.rs:LL:CC
fatal runtime error: thread local panicked on drop
error: abnormal termination: the program aborted execution
--> RUSTLIB/std/src/sys/PLATFORM/mod.rs:LL:CC
|
LL | unsafe { libc::abort() }
| ^^^^^^^^^^^^^ the program aborted execution
|
= note: inside `std::sys::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/PLATFORM/mod.rs:LL:CC
= note: inside `<std::thread::local_impl::abort_on_dtor_unwind::DtorUnwindGuard as std::ops::Drop>::drop` at RUSTLIB/std/src/rt.rs:LL:CC
= note: inside `std::ptr::drop_in_place::<std::thread::local_impl::abort_on_dtor_unwind::DtorUnwindGuard> - shim(Some(std::thread::local_impl::abort_on_dtor_unwind::DtorUnwindGuard))` at RUSTLIB/core/src/ptr/mod.rs:LL:CC
= note: inside `RUSTLIB/std/src/sys/PLATFORM/thread_local/fast_local.rs:LL:CC]>` at RUSTLIB/std/src/sys/PLATFORM/thread_local/mod.rs:LL:CC
note: inside `NOISY::__getit::destroy`
--> $DIR/thread_local_const_drop_panic.rs:LL:CC
|
LL | / thread_local! {
LL | | pub static NOISY: NoisyDrop = const { NoisyDrop {} };
LL | | }
| |_^
= note: this error originates in the macro `$crate::thread::local_impl::thread_local_inner` which comes from the expansion of the macro `thread_local` (in Nightly builds, run with -Z macro-backtrace for more info)
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
error: aborting due to previous error

3
src/tools/miri/tests/fail/panic/thread_local_drop_panic.rs
View file

@ -1,4 +1,7 @@
//@error-in-other-file: aborted execution
// Backtraces vary wildly between platforms, we have to normalize away almost the entire thing
//@normalize-stderr-test: "'main'|'<unnamed>'" -> "$$NAME"
//@normalize-stderr-test: ".*(note|-->|\|).*\n" -> ""
pub struct NoisyDrop {}

11
src/tools/miri/tests/fail/panic/thread_local_drop_panic.stderr
View file

@ -1,15 +1,6 @@
thread '<unnamed>' panicked at 'ow', $DIR/thread_local_drop_panic.rs:LL:CC
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
thread $NAME panicked at 'ow', $DIR/thread_local_drop_panic.rs:LL:CC
fatal runtime error: thread local panicked on drop
error: abnormal termination: the program aborted execution
--> RUSTLIB/std/src/sys/PLATFORM/mod.rs:LL:CC
|
LL | unsafe { libc::abort() }
| ^^^^^^^^^^^^^ the program aborted execution
|
= note: inside `std::sys::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/PLATFORM/mod.rs:LL:CC
= note: inside `std::sys::PLATFORM::thread_local::fast_local::destroy_value::<NoisyDrop>` at RUSTLIB/std/src/rt.rs:LL:CC
= note: inside `std::sys_common::thread_local_dtor::register_dtor_fallback::run_dtors` at RUSTLIB/std/src/sys_common/thread_local_dtor.rs:LL:CC
error: aborting due to previous error