Skip to content

Commit 67ffc9e

Browse files
committed
Re-enable some tests
1 parent ca8949b commit 67ffc9e

File tree

1 file changed

+1
-23
lines changed

1 file changed

+1
-23
lines changed

scripts/test_rustc_tests.sh

Lines changed: 1 addition & 23 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
@@ -147,9 +142,6 @@ rm -r tests/run-make/panic-abort-eh_frame # .eh_frame emitted with panic=abort
147142
# bugs in the test suite
148143
# ======================
149144
rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
150-
rm tests/ui/backtrace/synchronized-panic-handler.rs # missing needs-unwind annotation
151-
rm tests/ui/lint/non-snake-case/lint-non-snake-case-crate.rs # same
152-
rm tests/ui/async-await/async-drop/async-drop-initial.rs # same (rust-lang/rust#140493)
153145
rm -r tests/ui/codegen/equal-pointers-unequal # make incorrect assumptions about the location of stack variables
154146

155147
rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
@@ -159,20 +151,6 @@ rm tests/ui/process/process-panic-after-fork.rs # same
159151
cp ../dist/bin/rustdoc-clif ../dist/bin/rustdoc # some tests expect bin/rustdoc to exist
160152

161153
cat <<EOF | git apply -
162-
diff --git a/tests/run-make/linker-warning/rmake.rs b/tests/run-make/linker-warning/rmake.rs
163-
index 30387af428c..f7895b12961 100644
164-
--- a/tests/run-make/linker-warning/rmake.rs
165-
+++ b/tests/run-make/linker-warning/rmake.rs
166-
@@ -57,7 +57,8 @@ fn main() {
167-
.actual_text("(linker error)", out.stderr())
168-
- .normalize(r#"/rustc[^/]*/"#, "/rustc/")
169-
+ .normalize(r#"/tmp/rustc[^/]*/"#, "/tmp/rustc/")
170-
+ .normalize("libpanic_abort", "libpanic_unwind")
171-
.normalize(
172-
regex::escape(run_make_support::build_root().to_str().unwrap()),
173-
"/build-root",
174-
)
175-
.normalize(r#""[^"]*\/symbols.o""#, "\\"/symbols.o\\"")
176154
diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs
177155
index 073116933bd..c3e4578204d 100644
178156
--- a/src/tools/compiletest/src/runtest/run_make.rs
@@ -188,5 +166,5 @@ index 073116933bd..c3e4578204d 100644
188166
EOF
189167

190168
echo "[TEST] rustc test suite"
191-
COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 --test-args=--no-capture tests/{codegen-units,run-make,ui,incremental}
169+
COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 tests/{codegen-units,ui,incremental}
192170
popd

0 commit comments

Comments
 (0)