Skip to content

Commit daa32df

Browse files
authored
Rollup merge of rust-lang#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#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
2 parents a667060 + 0a71873 commit daa32df

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

tests/ui/panics/panic-main.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414

1515
//@[unwind-zero] compile-flags: -Cpanic=unwind
1616
//@[unwind-zero] exec-env:RUST_BACKTRACE=0
17+
//@[unwind-zero] needs-unwind
1718

1819
//@[unwind-one] compile-flags: -Cpanic=unwind
1920
//@[unwind-one] exec-env:RUST_BACKTRACE=1
21+
//@[unwind-one] needs-unwind
2022

2123
//@[unwind-full] compile-flags: -Cpanic=unwind
2224
//@[unwind-full] exec-env:RUST_BACKTRACE=full
25+
//@[unwind-full] needs-unwind
2326

2427
//@ run-fail
2528
//@ error-pattern:moop

0 commit comments

Comments
 (0)