Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 4976aa5

Browse files
committed
Workaround a couple of bugs in rustc's test suite
1 parent 5320a80 commit 4976aa5

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

scripts/test_rustc_tests.sh

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,26 @@ pushd rust
1010

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

13+
# FIXME(rust-lang/rust#122196) fix stage0 rmake.rs run-make tests and remove
14+
# this workaround
15+
for test in $(ls tests/run-make); do
16+
if [[ -e "tests/run-make/$test/rmake.rs" ]]; then
17+
rm -r "tests/run-make/$test"
18+
fi
19+
done
20+
21+
# FIXME remove this workaround once ICE tests no longer emit an outdated nightly message
22+
for test in $(rg -i --files-with-matches "//@(\[.*\])? failure-status: 101" tests/ui); do
23+
echo "rm $test"
24+
rm $test
25+
done
26+
1327
rm -r tests/ui/{unsized-locals/,lto/,linkage*} || true
1428
for test in $(rg --files-with-matches "lto" tests/{codegen-units,ui,incremental}); do
1529
rm $test
1630
done
1731

18-
for test in $(rg -i --files-with-matches "//(\[\w+\])?~[^\|]*\s*ERR|//@ error-pattern:|//@ build-fail|//@ run-fail|-Cllvm-args" tests/ui); do
32+
for test in $(rg -i --files-with-matches "//(\[\w+\])?~[^\|]*\s*ERR|//@ error-pattern:|//@(\[.*\])? build-fail|//@(\[.*\])? run-fail|-Cllvm-args" tests/ui); do
1933
rm $test
2034
done
2135

@@ -107,8 +121,6 @@ rm -r tests/run-make/optimization-remarks-dir # remarks are LLVM specific
107121
rm tests/ui/mir/mir_misc_casts.rs # depends on deduplication of constants
108122
rm tests/ui/mir/mir_raw_fat_ptr.rs # same
109123
rm tests/ui/consts/issue-33537.rs # same
110-
rm tests/ui/layout/valid_range_oob.rs # different ICE message
111-
rm tests/ui/const-generics/generic_const_exprs/issue-80742.rs # gives error instead of ICE with cg_clif
112124

113125
# rustdoc-clif passes extra args, suppressing the help message when no args are passed
114126
rm -r tests/run-make/issue-88756-default-output

0 commit comments

Comments
 (0)