Skip to content

Commit

Permalink
Rollup merge of #112616 - ferrocene:pa-more-test-suite-fixes, r=Nilst…
Browse files Browse the repository at this point in the history
…rieb

Improve tests on targets without unwinding

This PR makes more miscellaneous changes to tests, to make it work on targets without unwinding support.
  • Loading branch information
matthiaskrgr authored Jun 23, 2023
2 parents 54d6738 + fd4726f commit ff59614
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tests/codegen/naked-nocoverage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use std::arch::asm;
#[naked]
#[no_mangle]
pub unsafe extern "C" fn f() {
// CHECK: define void @f()
// CHECK: define {{(dso_local )?}}void @f()
// CHECK-NEXT: start:
// CHECK-NEXT: call void asm
// CHECK-NEXT: unreachable
Expand Down
1 change: 1 addition & 0 deletions tests/ui/asm/aarch64/may_unwind.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// only-aarch64
// run-pass
// needs-asm-support
// needs-unwind

#![feature(asm_unwind)]

Expand Down
1 change: 1 addition & 0 deletions tests/ui/test-attrs/test-panic-abort-disabled.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// compile-flags: --test -Cpanic=abort -Zpanic-abort-tests=no
// run-flags: --test-threads=1

// needs-unwind
// ignore-wasm no panic or subprocess support
// ignore-emscripten no panic or subprocess support

Expand Down
3 changes: 1 addition & 2 deletions tests/ui/test-attrs/test-type.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// compile-flags: --test
// compile-flags: --test -Zpanic-abort-tests
// run-flags: --test-threads=1
// check-run-results
// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
// ignore-emscripten no threads support
// needs-unwind
// run-pass

#[test]
Expand Down

0 comments on commit ff59614

Please sign in to comment.