about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <476013+matthiaskrgr@users.noreply.github.com>2025-07-19 08:55:35 +0200
committerGitHub <noreply@github.com>2025-07-19 08:55:35 +0200
commit5e2416fd768bad69eda93d6665bbb60e8ec6cf38 (patch)
tree1e31a9b3f4c7736a4e84b6d05816af746d5ade87
parent3b4d79c949ec707ca477053392167e6f0d24e0dd (diff)
parent0a71873c34d38978121853f0d97358427bd54038 (diff)
downloadrust-5e2416fd768bad69eda93d6665bbb60e8ec6cf38.tar.gz
rust-5e2416fd768bad69eda93d6665bbb60e8ec6cf38.zip
Rollup merge of #144073 - erickt:ignore-test-on-fuchsia, r=lqd
Don't test panic=unwind in panic_main.rs on Fuchsia

````@Enselic```` added a few new test conditions to tests/ui/panics/panic-main.rs in rust-lang/rust#142304, but it is unfortunately causing the test to fail for Fuchsia with the `panic=unwind` modes since we compile Rust for Fuchsia with `panic=abort`. This patch just ignores the test for Fuchsia.

Note that this test might also need to filter out a few other platforms, since another panicking test we exclude from Fuchsia https://github.com/rust-lang/rust/blob/master/tests/ui/panics/runtime-switch.rs also excludes running on msvc, android, openbsd, and wasm, but I'm not familiar with those platforms so I didn't want to add them here.

cc ````@compile-errors,```` who reviewed the initial PR
-rw-r--r--tests/ui/panics/panic-main.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/ui/panics/panic-main.rs b/tests/ui/panics/panic-main.rs
index bf79de78a57..2395f68241f 100644
--- a/tests/ui/panics/panic-main.rs
+++ b/tests/ui/panics/panic-main.rs
@@ -14,12 +14,15 @@
 
 //@[unwind-zero] compile-flags: -Cpanic=unwind
 //@[unwind-zero] exec-env:RUST_BACKTRACE=0
+//@[unwind-zero] needs-unwind
 
 //@[unwind-one] compile-flags: -Cpanic=unwind
 //@[unwind-one] exec-env:RUST_BACKTRACE=1
+//@[unwind-one] needs-unwind
 
 //@[unwind-full] compile-flags: -Cpanic=unwind
 //@[unwind-full] exec-env:RUST_BACKTRACE=full
+//@[unwind-full] needs-unwind
 
 //@ run-fail
 //@ error-pattern:moop