Skip to content

Commit 4ef286c

Browse files
committed
Fix rustc test suite
1 parent 332b54a commit 4ef286c

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

scripts/test_rustc_tests.sh

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,17 @@ pushd rust
1010

1111
command -v rg >/dev/null 2>&1 || cargo install ripgrep
1212

13-
# FIXME add needs-asm-support to all tests in tests/ui/asm
1413
rm -r tests/ui/{unsized-locals/,lto/,linkage*} || true
1514
for test in $(rg --files-with-matches "lto|// needs-asm-support|// needs-unwind" tests/{codegen-units,ui,incremental}); do
1615
rm $test
1716
done
1817

18+
for test in tests/run-make/**/Makefile; do
19+
if rg "# needs-asm-support|# needs-unwind" $test >/dev/null; then
20+
rm -r $(dirname $test)
21+
fi
22+
done
23+
1924
for test in $(rg -i --files-with-matches "//(\[\w+\])?~[^\|]*\s*ERR|// error-pattern:|// build-fail|// run-fail|-Cllvm-args" tests/ui); do
2025
rm $test
2126
done
@@ -28,24 +33,8 @@ rm tests/ui/parser/unclosed-delimiter-in-dep.rs # submodule contains //~ERROR
2833
# ================
2934

3035
# requires stack unwinding
31-
# FIXME add needs-unwind to these tests
32-
rm tests/incremental/change_crate_dep_kind.rs
33-
rm tests/incremental/issue-80691-bad-eval-cache.rs # -Cpanic=abort causes abort instead of exit(101)
34-
rm -r tests/run-make/c-unwind-abi-catch-lib-panic
35-
rm -r tests/run-make/c-unwind-abi-catch-panic
36-
rm -r tests/run-make/debug-assertions
37-
rm -r tests/run-make/foreign-double-unwind
38-
rm -r tests/run-make/foreign-exceptions
39-
rm -r tests/run-make/foreign-rust-exceptions
40-
rm -r tests/run-make/libtest-json
41-
rm -r tests/run-make/static-unwinding
42-
43-
# requires compiling with -Cpanic=unwind
44-
rm -r tests/ui/macros/rfc-2011-nicer-assert-messages/
45-
rm -r tests/run-make/test-benches
46-
rm tests/ui/test-attrs/test-type.rs
47-
rm -r tests/run-make/const_fn_mir
48-
rm -r tests/run-make/intrinsic-unreachable
36+
# FIXME add needs-unwind to this test
37+
rm -r tests/run-make/libtest-junit
4938

5039
# vendor intrinsics
5140
rm tests/ui/sse2.rs # cpuid not supported, so sse2 not detected

0 commit comments

Comments
 (0)