@@ -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
@@ -139,9 +134,6 @@ rm -r tests/run-make/panic-abort-eh_frame # .eh_frame emitted with panic=abort
139134# bugs in the test suite
140135# ======================
141136rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
142- rm tests/ui/backtrace/synchronized-panic-handler.rs # missing needs-unwind annotation
143- rm tests/ui/lint/non-snake-case/lint-non-snake-case-crate.rs # same
144- rm tests/ui/async-await/async-drop/async-drop-initial.rs # same (rust-lang/rust#140493)
145137rm -r tests/ui/codegen/equal-pointers-unequal # make incorrect assumptions about the location of stack variables
146138
147139rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
@@ -151,20 +143,6 @@ rm tests/ui/process/process-panic-after-fork.rs # same
151143cp ../dist/bin/rustdoc-clif ../dist/bin/rustdoc # some tests expect bin/rustdoc to exist
152144
153145cat << EOF | git apply -
154- diff --git a/tests/run-make/linker-warning/rmake.rs b/tests/run-make/linker-warning/rmake.rs
155- index 30387af428c..f7895b12961 100644
156- --- a/tests/run-make/linker-warning/rmake.rs
157- +++ b/tests/run-make/linker-warning/rmake.rs
158- @@ -57,7 +57,8 @@ fn main() {
159- .actual_text("(linker error)", out.stderr())
160- - .normalize(r#"/rustc[^/]*/"#, "/rustc/")
161- + .normalize(r#"/tmp/rustc[^/]*/"#, "/tmp/rustc/")
162- + .normalize("libpanic_abort", "libpanic_unwind")
163- .normalize(
164- regex::escape(run_make_support::build_root().to_str().unwrap()),
165- "/build-root",
166- )
167- .normalize(r#""[^"]*\/symbols.o""#, "\\ "/symbols.o\\ "")
168146diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs
169147index 073116933bd..c3e4578204d 100644
170148--- a/src/tools/compiletest/src/runtest/run_make.rs
@@ -180,5 +158,5 @@ index 073116933bd..c3e4578204d 100644
180158EOF
181159
182160echo " [TEST] rustc test suite"
183- COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 --test-args=--no-capture tests/{codegen-units,run-make ,ui,incremental}
161+ COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 tests/{codegen-units,ui,incremental}
184162popd
0 commit comments