Skip to content

Commit f2bc7e0

Browse files
authored
Rollup merge of #111094 - bjorn3:fix_test_annotations, r=jyn514
Add needs-unwind annotations to tests that need stack unwinding This allows filtering them out when running the rustc test suite for cg_clif.
2 parents 5075457 + 8a08514 commit f2bc7e0

File tree

13 files changed

+13
-0
lines changed

13 files changed

+13
-0
lines changed

tests/incremental/change_crate_dep_kind.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// detected then -Zincremental-verify-ich will trigger an assertion.
33

44
// ignore-wasm32-bare compiled with panic=abort by default
5+
// needs-unwind
56
// revisions:cfail1 cfail2
67
// compile-flags: -Z query-dep-graph -Cpanic=unwind
78
// build-pass (FIXME(62277): could be check-pass?)

tests/incremental/issue-80691-bad-eval-cache.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// revisions: rfail1 rfail2
22
// failure-status: 101
33
// error-pattern: not implemented
4+
// needs-unwind -Cpanic=abort causes abort instead of exit(101)
45

56
pub trait Interner {
67
type InternedVariableKinds;

tests/run-make/c-unwind-abi-catch-lib-panic/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ignore-cross-compile
2+
# needs-unwind
23
include ../tools.mk
34

45
all: archive

tests/run-make/c-unwind-abi-catch-panic/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ignore-cross-compile
2+
# needs-unwind
23
include ../tools.mk
34

45
all: $(call NATIVE_STATICLIB,add)

tests/run-make/const_fn_mir/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# needs-unwind -Cpanic=abort gives different MIR output
12
include ../tools.mk
23

34
all:

tests/run-make/debug-assertions/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ignore-cross-compile
2+
# needs-unwind
23
include ../tools.mk
34

45
all:

tests/run-make/foreign-double-unwind/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ignore-cross-compile
2+
# needs-unwind
23
include ../tools.mk
34

45
all: foo

tests/run-make/foreign-exceptions/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ignore-cross-compile
2+
# needs-unwind
23
include ../tools.mk
34

45
all: foo

tests/run-make/foreign-rust-exceptions/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# ignore-cross-compile
22
# ignore-i686-pc-windows-gnu
3+
# needs-unwind
34

45
# This test doesn't work on 32-bit MinGW as cdylib has its own copy of unwinder
56
# so cross-DLL unwinding does not work.

tests/run-make/libtest-json/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ignore-cross-compile
2+
# needs-unwind
23
include ../tools.mk
34

45
# Test expected libtest's JSON output

tests/run-make/static-unwinding/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# ignore-cross-compile
2+
# needs-unwind
23
include ../tools.mk
34

45
all:

tests/run-make/test-benches/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include ../tools.mk
22

33
# ignore-cross-compile
4+
# needs-unwind #[bench] and -Zpanic-abort-tests can't be combined
45

56
all:
67
# Smoke-test that `#[bench]` isn't entirely broken.

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

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
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
67
// run-pass
78

89
#[test]

0 commit comments

Comments
 (0)