@@ -15,11 +15,6 @@ for test in $(rg --files-with-matches "lto" tests/{codegen-units,ui,incremental}
1515 rm $test
1616done
1717
18- # should-fail tests don't work when compiletest is compiled with panic=abort
19- for test in $( rg --files-with-matches " //@ should-fail" tests/{codegen-units,ui,incremental}) ; do
20- rm $test
21- done
22-
2318for test in $( rg -i --files-with-matches " //(\[\w+\])?~[^\|]*\s*ERR|//@ error-pattern:|//@(\[.*\])? build-fail|//@(\[.*\])? run-fail|-Cllvm-args" tests/ui) ; do
2419 rm $test
2520done
@@ -143,9 +138,6 @@ rm -r tests/run-make/panic-abort-eh_frame # .eh_frame emitted with panic=abort
143138# bugs in the test suite
144139# ======================
145140rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
146- rm tests/ui/backtrace/synchronized-panic-handler.rs # missing needs-unwind annotation
147- rm tests/ui/lint/non-snake-case/lint-non-snake-case-crate.rs # same
148- rm tests/ui/async-await/async-drop/async-drop-initial.rs # same (rust-lang/rust#140493)
149141rm -r tests/ui/codegen/equal-pointers-unequal # make incorrect assumptions about the location of stack variables
150142
151143rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
@@ -155,20 +147,6 @@ rm tests/ui/process/process-panic-after-fork.rs # same
155147cp ../dist/bin/rustdoc-clif ../dist/bin/rustdoc # some tests expect bin/rustdoc to exist
156148
157149cat << EOF | git apply -
158- diff --git a/tests/run-make/linker-warning/rmake.rs b/tests/run-make/linker-warning/rmake.rs
159- index 30387af428c..f7895b12961 100644
160- --- a/tests/run-make/linker-warning/rmake.rs
161- +++ b/tests/run-make/linker-warning/rmake.rs
162- @@ -57,7 +57,8 @@ fn main() {
163- .actual_text("(linker error)", out.stderr())
164- - .normalize(r#"/rustc[^/]*/"#, "/rustc/")
165- + .normalize(r#"/tmp/rustc[^/]*/"#, "/tmp/rustc/")
166- + .normalize("libpanic_abort", "libpanic_unwind")
167- .normalize(
168- regex::escape(run_make_support::build_root().to_str().unwrap()),
169- "/build-root",
170- )
171- .normalize(r#""[^"]*\/symbols.o""#, "\\ "/symbols.o\\ "")
172150diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs
173151index 073116933bd..c3e4578204d 100644
174152--- a/src/tools/compiletest/src/runtest/run_make.rs
@@ -184,5 +162,5 @@ index 073116933bd..c3e4578204d 100644
184162EOF
185163
186164echo " [TEST] rustc test suite"
187- COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 --test-args=--no-capture tests/{codegen-units,run-make ,ui,incremental}
165+ COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 tests/{codegen-units,ui,incremental}
188166popd
0 commit comments