Skip to content

Commit ed22f88

Browse files
committed
Re-enable some tests
1 parent f57703a commit ed22f88

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

scripts/test_rustc_tests.sh

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ for test in $(rg --files-with-matches "lto" tests/{codegen-units,ui,incremental}
1515
rm $test
1616
done
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-
2318
for test in $(rg -i --files-with-matches "//(\[\w+\])?~[^\|]*\s*ERR|//@ error-pattern:|//@(\[.*\])? build-fail|//@(\[.*\])? run-fail|-Cllvm-args" tests/ui); do
2419
rm $test
2520
done
@@ -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
# ======================
145140
rm 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)
149141
rm -r tests/ui/codegen/equal-pointers-unequal # make incorrect assumptions about the location of stack variables
150142

151143
rm 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
155147
cp ../dist/bin/rustdoc-clif ../dist/bin/rustdoc # some tests expect bin/rustdoc to exist
156148

157149
cat <<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\\"")
172150
diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs
173151
index 073116933bd..c3e4578204d 100644
174152
--- a/src/tools/compiletest/src/runtest/run_make.rs

0 commit comments

Comments
 (0)