Skip to content

Commit ff59614

Browse files
authored
Rollup merge of #112616 - ferrocene:pa-more-test-suite-fixes, r=Nilstrieb
Improve tests on targets without unwinding This PR makes more miscellaneous changes to tests, to make it work on targets without unwinding support.
2 parents 54d6738 + fd4726f commit ff59614

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

tests/codegen/naked-nocoverage.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::arch::asm;
1111
#[naked]
1212
#[no_mangle]
1313
pub unsafe extern "C" fn f() {
14-
// CHECK: define void @f()
14+
// CHECK: define {{(dso_local )?}}void @f()
1515
// CHECK-NEXT: start:
1616
// CHECK-NEXT: call void asm
1717
// CHECK-NEXT: unreachable

tests/ui/asm/aarch64/may_unwind.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// only-aarch64
22
// run-pass
33
// needs-asm-support
4+
// needs-unwind
45

56
#![feature(asm_unwind)]
67

tests/ui/test-attrs/test-panic-abort-disabled.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// compile-flags: --test -Cpanic=abort -Zpanic-abort-tests=no
44
// run-flags: --test-threads=1
55

6+
// needs-unwind
67
// ignore-wasm no panic or subprocess support
78
// ignore-emscripten no panic or subprocess support
89

tests/ui/test-attrs/test-type.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// compile-flags: --test
1+
// compile-flags: --test -Zpanic-abort-tests
22
// run-flags: --test-threads=1
33
// check-run-results
44
// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
55
// ignore-emscripten no threads support
6-
// needs-unwind
76
// run-pass
87

98
#[test]

0 commit comments

Comments
 (0)