Skip to content

Commit 0e001ef

Browse files
committed
Re-enable some tests
1 parent 4a7b723 commit 0e001ef

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

scripts/test_rustc_tests.sh

Lines changed: 0 additions & 21 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
@@ -142,8 +137,6 @@ rm -r tests/run-make/panic-abort-eh_frame # .eh_frame emitted with panic=abort
142137
# bugs in the test suite
143138
# ======================
144139
rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
145-
rm tests/ui/backtrace/synchronized-panic-handler.rs # missing needs-unwind annotation
146-
rm tests/ui/lint/non-snake-case/lint-non-snake-case-crate.rs # same
147140
rm -r tests/ui/codegen/equal-pointers-unequal # make incorrect assumptions about the location of stack variables
148141

149142
rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
@@ -153,20 +146,6 @@ rm tests/ui/process/process-panic-after-fork.rs # same
153146
cp ../dist/bin/rustdoc-clif ../dist/bin/rustdoc # some tests expect bin/rustdoc to exist
154147

155148
cat <<EOF | git apply -
156-
diff --git a/tests/run-make/linker-warning/rmake.rs b/tests/run-make/linker-warning/rmake.rs
157-
index 30387af428c..f7895b12961 100644
158-
--- a/tests/run-make/linker-warning/rmake.rs
159-
+++ b/tests/run-make/linker-warning/rmake.rs
160-
@@ -57,7 +57,8 @@ fn main() {
161-
.actual_text("(linker error)", out.stderr())
162-
- .normalize(r#"/rustc[^/]*/"#, "/rustc/")
163-
+ .normalize(r#"/tmp/rustc[^/]*/"#, "/tmp/rustc/")
164-
+ .normalize("libpanic_abort", "libpanic_unwind")
165-
.normalize(
166-
regex::escape(run_make_support::build_root().to_str().unwrap()),
167-
"/build-root",
168-
)
169-
.normalize(r#""[^"]*\/symbols.o""#, "\\"/symbols.o\\"")
170149
diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs
171150
index 073116933bd..c3e4578204d 100644
172151
--- a/src/tools/compiletest/src/runtest/run_make.rs

0 commit comments

Comments
 (0)