diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-06-23 19:39:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 19:39:57 +0200 |
| commit | ff596144bee89d0f7a6a7f22914ffe799b9ef5b9 (patch) | |
| tree | b49615219d4dec63ad53dc1ef385f0f6d3748d91 /tests | |
| parent | 54d6738a8df74382c439e1dfb9ce4e2382d7742e (diff) | |
| parent | fd4726f74041672c20e9e0753058bf7712dcff19 (diff) | |
| download | rust-ff596144bee89d0f7a6a7f22914ffe799b9ef5b9.tar.gz rust-ff596144bee89d0f7a6a7f22914ffe799b9ef5b9.zip | |
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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/codegen/naked-nocoverage.rs | 2 | ||||
| -rw-r--r-- | tests/ui/asm/aarch64/may_unwind.rs | 1 | ||||
| -rw-r--r-- | tests/ui/test-attrs/test-panic-abort-disabled.rs | 1 | ||||
| -rw-r--r-- | tests/ui/test-attrs/test-type.rs | 3 |
4 files changed, 4 insertions, 3 deletions
diff --git a/tests/codegen/naked-nocoverage.rs b/tests/codegen/naked-nocoverage.rs index 91a6260bf2a..3c755e49c6d 100644 --- a/tests/codegen/naked-nocoverage.rs +++ b/tests/codegen/naked-nocoverage.rs @@ -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 diff --git a/tests/ui/asm/aarch64/may_unwind.rs b/tests/ui/asm/aarch64/may_unwind.rs index 6af8728bbaa..cfb75078264 100644 --- a/tests/ui/asm/aarch64/may_unwind.rs +++ b/tests/ui/asm/aarch64/may_unwind.rs @@ -1,6 +1,7 @@ // only-aarch64 // run-pass // needs-asm-support +// needs-unwind #![feature(asm_unwind)] diff --git a/tests/ui/test-attrs/test-panic-abort-disabled.rs b/tests/ui/test-attrs/test-panic-abort-disabled.rs index 874dbdb42c3..fa67a784de4 100644 --- a/tests/ui/test-attrs/test-panic-abort-disabled.rs +++ b/tests/ui/test-attrs/test-panic-abort-disabled.rs @@ -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 diff --git a/tests/ui/test-attrs/test-type.rs b/tests/ui/test-attrs/test-type.rs index 8416270fd81..d6d44a6b446 100644 --- a/tests/ui/test-attrs/test-type.rs +++ b/tests/ui/test-attrs/test-type.rs @@ -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] |