diff options
| author | Ralf Jung <post@ralfj.de> | 2023-08-24 20:08:22 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2023-08-25 08:20:19 +0200 |
| commit | df5a248cb1d557f8df9c9d0660e8d704bc1e0919 (patch) | |
| tree | 727bc4142af6109dfd791fa599294eb4b3521f55 | |
| parent | 339d636120cbec1a593557498389e616b47a032a (diff) | |
| download | rust-df5a248cb1d557f8df9c9d0660e8d704bc1e0919.tar.gz rust-df5a248cb1d557f8df9c9d0660e8d704bc1e0919.zip | |
keep trying which flags we need for this test until it passes bors
| -rw-r--r-- | tests/ui/panics/panic-in-cleanup.rs | 5 | ||||
| -rw-r--r-- | tests/ui/panics/panic-in-cleanup.run.stderr | 4 | ||||
| -rw-r--r-- | tests/ui/panics/panic-in-ffi.rs | 4 | ||||
| -rw-r--r-- | tests/ui/panics/panic-in-ffi.run.stderr | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/tests/ui/panics/panic-in-cleanup.rs b/tests/ui/panics/panic-in-cleanup.rs index b4519da4e6a..a1c797268d1 100644 --- 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 index fa201b9667f..923bac69c50 100644 --- 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 index bb30398531f..da2b24945be 100644 --- 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 index a6de98c4913..3422f5ccc4d 100644 --- 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: |