keep trying which flags we need for this test until it passes bors

rust-lang · Aug 25, 2023 · df5a248 · df5a248
1 parent 339d636
commit df5a248
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/tests/ui/panics/panic-in-cleanup.rs b/tests/ui/panics/panic-in-cleanup.rs
@@ -1,9 +1,12 @@
 // run-fail
+// exec-env:RUST_BACKTRACE=0
 // check-run-results
 // error-pattern: panic in a destructor during cleanup
 // normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
 // normalize-stderr-test: "\n +at [^\n]+" -> ""
-// ignore-emscripten no processes
+// needs-unwind
+// ignore-emscripten "RuntimeError" junk in output
+// ignore-msvc SEH doesn't do panic-during-cleanup the same way as everyone else
 
 struct Bomb;
 

diff --git a/tests/ui/panics/panic-in-cleanup.run.stderr b/tests/ui/panics/panic-in-cleanup.run.stderr
@@ -1,7 +1,7 @@
-thread 'main' panicked at $DIR/panic-in-cleanup.rs:18:5:
+thread 'main' panicked at $DIR/panic-in-cleanup.rs:21:5:
 explicit panic
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-thread 'main' panicked at $DIR/panic-in-cleanup.rs:12:9:
+thread 'main' panicked at $DIR/panic-in-cleanup.rs:15:9:
 BOOM
 stack backtrace:
 thread 'main' panicked at library/core/src/panicking.rs:126:5:

diff --git a/tests/ui/panics/panic-in-ffi.rs b/tests/ui/panics/panic-in-ffi.rs
@@ -1,9 +1,11 @@
 // run-fail
+// exec-env:RUST_BACKTRACE=0
 // check-run-results
 // error-pattern: panic in a function that cannot unwind
 // normalize-stderr-test: "\n +[0-9]+:[^\n]+" -> ""
 // normalize-stderr-test: "\n +at [^\n]+" -> ""
-// ignore-emscripten no processes
+// needs-unwind
+// ignore-emscripten "RuntimeError" junk in output
 #![feature(c_unwind)]
 
 extern "C" fn panic_in_ffi() {

diff --git a/tests/ui/panics/panic-in-ffi.run.stderr b/tests/ui/panics/panic-in-ffi.run.stderr
@@ -1,4 +1,4 @@
-thread 'main' panicked at $DIR/panic-in-ffi.rs:10:5:
+thread 'main' panicked at $DIR/panic-in-ffi.rs:12:5:
 Test
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 thread 'main' panicked at library/core/src/panicking.rs:126:5: