Skip to content

Commit 4bc0e25

Browse files
oli-obkoli-obk
committed
Remove a miri-specific note from test output
1 parent 2253941 commit 4bc0e25

35 files changed

+2
-34
lines changed

‎tests/fail/function_calls/exported_symbol_bad_unwind1.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/function_calls/exported_symbol_bad_unwind1.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding
65
--> tests/fail/function_calls/exported_symbol_bad_unwind1.rs:LL:CC
76
|

‎tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
65
panic in a function that cannot unwind
76
stack backtrace:

‎tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
65
panic in a function that cannot unwind
76
stack backtrace:

‎tests/fail/function_calls/exported_symbol_bad_unwind2.extern_block.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding
65
--> tests/fail/function_calls/exported_symbol_bad_unwind2.rs:LL:CC
76
|

‎tests/fail/function_calls/return_pointer_on_unwind.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/function_calls/return_pointer_on_unwind.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory
65
--> tests/fail/function_calls/return_pointer_on_unwind.rs:LL:CC
76
|

‎tests/fail/intrinsics/uninit_uninhabited_type.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
22
aborted execution: attempted to instantiate uninhabited type `!`
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread caused non-unwinding panic. aborting.
65
error: abnormal termination: the program aborted execution
76
--> RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC

‎tests/fail/intrinsics/zero_fn_ptr.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
22
aborted execution: attempted to zero-initialize type `fn()`, which is invalid
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread caused non-unwinding panic. aborting.
65
error: abnormal termination: the program aborted execution
76
--> RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC

‎tests/fail/panic/abort_unwind.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/panic/abort_unwind.rs:LL:CC:
22
PANIC!!!
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
65
panic in a function that cannot unwind
76
stack backtrace:

‎tests/fail/panic/bad_unwind.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/panic/bad_unwind.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
error: Undefined Behavior: unwinding past a stack frame that does not allow unwinding
65
--> tests/fail/panic/bad_unwind.rs:LL:CC
76
|

‎tests/fail/panic/double_panic.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/panic/double_panic.rs:LL:CC:
22
first
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread 'main' panicked at tests/fail/panic/double_panic.rs:LL:CC:
65
second
76
stack backtrace:

‎tests/fail/panic/panic_abort1.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/panic/panic_abort1.rs:LL:CC:
22
panicking from libstd
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
error: abnormal termination: the program aborted execution
65
--> RUSTLIB/panic_abort/src/lib.rs:LL:CC
76
|

‎tests/fail/panic/panic_abort2.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/panic/panic_abort2.rs:LL:CC:
22
42-panicking from libstd
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
error: abnormal termination: the program aborted execution
65
--> RUSTLIB/panic_abort/src/lib.rs:LL:CC
76
|

‎tests/fail/panic/panic_abort3.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/panic/panic_abort3.rs:LL:CC:
22
panicking from libcore
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
error: abnormal termination: the program aborted execution
65
--> RUSTLIB/panic_abort/src/lib.rs:LL:CC
76
|

‎tests/fail/panic/panic_abort4.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/panic/panic_abort4.rs:LL:CC:
22
42-panicking from libcore
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
error: abnormal termination: the program aborted execution
65
--> RUSTLIB/panic_abort/src/lib.rs:LL:CC
76
|

‎tests/fail/terminate-terminator.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ warning: You have explicitly enabled MIR optimizations, overriding Miri's defaul
33
thread 'main' panicked at tests/fail/terminate-terminator.rs:LL:CC:
44
explicit panic
55
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
6-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
76
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
87
panic in a function that cannot unwind
98
stack backtrace:

‎tests/fail/unwind-action-terminate.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/fail/unwind-action-terminate.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread 'main' panicked at RUSTLIB/core/src/panicking.rs:LL:CC:
65
panic in a function that cannot unwind
76
stack backtrace:

‎tests/panic/alloc_error_handler_hook.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
thread 'main' panicked at tests/panic/alloc_error_handler_hook.rs:LL:CC:
22
alloc error hook called
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
yes we are unwinding!

‎tests/panic/alloc_error_handler_panic.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
thread 'main' panicked at RUSTLIB/std/src/alloc.rs:LL:CC:
22
memory allocation of 4 bytes failed
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
yes we are unwinding!

‎tests/panic/div-by-zero-2.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/div-by-zero-2.rs:LL:CC:
22
attempt to divide by zero
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/function_calls/exported_symbol_good_unwind.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/panic/function_calls/exported_symbol_good_unwind.rs:LL:CC:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread 'main' panicked at tests/panic/function_calls/exported_symbol_good_unwind.rs:LL:CC:
65
explicit panic
76
thread 'main' panicked at tests/panic/function_calls/exported_symbol_good_unwind.rs:LL:CC:

‎tests/panic/oob_subslice.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/oob_subslice.rs:LL:CC:
22
range end index 5 out of range for slice of length 4
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/overflowing-lsh-neg.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/overflowing-lsh-neg.rs:LL:CC:
22
attempt to shift left with overflow
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/overflowing-rsh-1.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/overflowing-rsh-1.rs:LL:CC:
22
attempt to shift right with overflow
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/overflowing-rsh-2.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/overflowing-rsh-2.rs:LL:CC:
22
attempt to shift right with overflow
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/panic2.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/panic2.rs:LL:CC:
22
42-panicking from libstd
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/panic3.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/panic3.rs:LL:CC:
22
panicking from libcore
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/panic4.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/panic4.rs:LL:CC:
22
42-panicking from libcore
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/transmute_fat2.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/transmute_fat2.rs:LL:CC:
22
index out of bounds: the len is 0 but the index is 0
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/unsupported_foreign_function.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/unsupported_foreign_function.rs:LL:CC:
22
unsupported Miri functionality: can't call foreign function `foo` on $OS
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/panic/unsupported_syscall.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
thread 'main' panicked at tests/panic/unsupported_syscall.rs:LL:CC:
22
unsupported Miri functionality: can't execute syscall with ID 0
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect

‎tests/pass/panic/catch_panic.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
22
Hello from std::panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
Caught panic message (&str): Hello from std::panic
65
thread 'main' panicked at tests/pass/panic/catch_panic.rs:LL:CC:
76
Hello from std::panic: 1

‎tests/pass/panic/concurrent-panic.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Thread 1 reported it has started
33
thread '<unnamed>' panicked at tests/pass/panic/concurrent-panic.rs:LL:CC:
44
panic in thread 2
55
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
6-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
76
Thread 2 blocking on thread 1
87
Thread 2 reported it has started
98
Unlocking mutex

‎tests/pass/panic/nested_panic_caught.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
thread 'main' panicked at tests/pass/panic/nested_panic_caught.rs:LL:CC:
22
once
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread 'main' panicked at tests/pass/panic/nested_panic_caught.rs:LL:CC:
65
twice
76
stack backtrace:

‎tests/pass/panic/thread_panic.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
thread '<unnamed>' panicked at tests/pass/panic/thread_panic.rs:LL:CC:
22
Hello!
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect
54
thread 'childthread' panicked at tests/pass/panic/thread_panic.rs:LL:CC:
65
Hello, world!

‎tests/ui.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ regexes! {
276276
"sys/pal/[a-z]+/" => "sys/pal/PLATFORM/",
277277
// erase paths into the crate registry
278278
r"[^ ]*/\.?cargo/registry/.*/(.*\.rs)" => "CARGO_REGISTRY/.../$1",
279+
// erase extra panic message that actual runtime code doesn't have
280+
"note: in Miri, you may have to set `MIRIFLAGS=-Zmiri-env-forward=RUST_BACKTRACE` for the environment variable to have an effect\n" => "",
279281
}
280282

281283
enum Dependencies {

0 commit comments

Comments
 (0)