Skip to content

Commit df5a248

Browse files
committed
keep trying which flags we need for this test until it passes bors
1 parent 339d636 commit df5a248

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

tests/ui/panics/panic-in-cleanup.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
// run-fail
2+
// exec-env:RUST_BACKTRACE=0
23
// check-run-results
34
// error-pattern: panic in a destructor during cleanup
45
// normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
56
// normalize-stderr-test: "\n +at [^\n]+" -> ""
6-
// ignore-emscripten no processes
7+
// needs-unwind
8+
// ignore-emscripten "RuntimeError" junk in output
9+
// ignore-msvc SEH doesn't do panic-during-cleanup the same way as everyone else
710

811
struct Bomb;
912

tests/ui/panics/panic-in-cleanup.run.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
thread 'main' panicked at $DIR/panic-in-cleanup.rs:18:5:
1+
thread 'main' panicked at $DIR/panic-in-cleanup.rs:21:5:
22
explicit panic
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
4-
thread 'main' panicked at $DIR/panic-in-cleanup.rs:12:9:
4+
thread 'main' panicked at $DIR/panic-in-cleanup.rs:15:9:
55
BOOM
66
stack backtrace:
77
thread 'main' panicked at library/core/src/panicking.rs:126:5:

tests/ui/panics/panic-in-ffi.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
// run-fail
2+
// exec-env:RUST_BACKTRACE=0
23
// check-run-results
34
// error-pattern: panic in a function that cannot unwind
45
// normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
56
// normalize-stderr-test: "\n +at [^\n]+" -> ""
6-
// ignore-emscripten no processes
7+
// needs-unwind
8+
// ignore-emscripten "RuntimeError" junk in output
79
#![feature(c_unwind)]
810

911
extern "C" fn panic_in_ffi() {

tests/ui/panics/panic-in-ffi.run.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
thread 'main' panicked at $DIR/panic-in-ffi.rs:10:5:
1+
thread 'main' panicked at $DIR/panic-in-ffi.rs:12:5:
22
Test
33
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
44
thread 'main' panicked at library/core/src/panicking.rs:126:5:

0 commit comments

Comments
 (0)