File tree Expand file tree Collapse file tree 1 file changed +1
-15
lines changed Expand file tree Collapse file tree 1 file changed +1
-15
lines changed Original file line number Diff line number Diff line change @@ -35,16 +35,6 @@ use getopts;
35
35
extern crate libc;
36
36
use term;
37
37
38
- // FIXME(#54291): rustc and/or LLVM don't yet support building with panic-unwind
39
- // on aarch64-pc-windows-msvc, or thumbv7a-pc-windows-msvc
40
- // so we don't link libtest against libunwind (for the time being)
41
- // even though it means that libtest won't be fully functional on
42
- // these platforms.
43
- //
44
- // See also: https://github.com/rust-lang/rust/issues/54190#issuecomment-422904437
45
- #[ cfg( not( all( windows, any( target_arch = "aarch64" , target_arch = "arm" ) ) ) ) ]
46
- extern crate panic_unwind;
47
-
48
38
pub use self :: ColorConfig :: * ;
49
39
use self :: NamePadding :: * ;
50
40
use self :: OutputLocation :: * ;
@@ -1488,11 +1478,7 @@ pub fn run_test(
1488
1478
) {
1489
1479
let TestDescAndFn { desc, testfn } = test;
1490
1480
1491
- let ignore_because_panic_abort = cfg ! ( target_arch = "wasm32" )
1492
- && !cfg ! ( target_os = "emscripten" )
1493
- && desc. should_panic != ShouldPanic :: No ;
1494
-
1495
- if force_ignore || desc. ignore || ignore_because_panic_abort {
1481
+ if force_ignore || desc. ignore {
1496
1482
match strategy {
1497
1483
RunStrategy :: InProcess ( tx) | RunStrategy :: SpawnPrimary ( tx) => {
1498
1484
tx. send ( ( desc, TrIgnored , Vec :: new ( ) ) ) . unwrap ( ) ;
You can’t perform that action at this time.
0 commit comments