Skip to content

Commit 663fba0

Browse files
committed
Re-enable some tests
1 parent c5d5467 commit 663fba0

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

scripts/setup_rust_fork.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export CG_CLIF_FORCE_GNU_AS=1
88
# Compiletest expects all standard library paths to start with /rustc/FAKE_PREFIX.
99
# CG_CLIF_STDLIB_REMAP_PATH_PREFIX will cause cg_clif's build system to pass
1010
# --remap-path-prefix to handle this.
11-
CG_CLIF_STDLIB_REMAP_PATH_PREFIX=/rustc/FAKE_PREFIX ./y.sh build
11+
CG_CLIF_STDLIB_REMAP_PATH_PREFIX=/rustc/FAKE_PREFIX ./y.sh build --panic-unwind-support
1212

1313
echo "[SETUP] Rust fork"
1414
git clone --quiet https://github.com/rust-lang/rust.git --filter=tree:0 || true

scripts/test_rustc_tests.sh

Lines changed: 6 additions & 9 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
@@ -56,6 +51,8 @@ rm tests/ui/asm/x86_64/issue-96797.rs # const and sym inline asm operands don't
5651
rm tests/ui/asm/global-asm-mono-sym-fn.rs # same
5752
rm tests/ui/asm/naked-asm-mono-sym-fn.rs # same
5853
rm tests/ui/asm/x86_64/goto.rs # inline asm labels not supported
54+
rm tests/ui/asm/aarch64/may_unwind.rs # inline asm unwind not supported
55+
rm tests/ui/asm/may_unwind.rs # same
5956
rm tests/ui/simd/simd-bitmask-notpow2.rs # non-pow-of-2 simd vector sizes
6057
rm -r tests/run-make/embed-source-dwarf # embedding sources in debuginfo
6158

@@ -76,6 +73,7 @@ rm -r tests/ui/instrument-coverage/
7673
# ==================
7774
rm tests/ui/codegen/issue-28950.rs # depends on stack size optimizations
7875
rm tests/ui/codegen/init-large-type.rs # same
76+
rm tests/ui/codegen/StackColoring-not-blowup-stack-issue-40883.rs # same
7977
rm -r tests/run-make/fmt-write-bloat/ # tests an optimization
8078
rm tests/ui/statics/const_generics.rs # same
8179
rm tests/ui/linking/executable-no-mangle-strip.rs # requires --gc-sections to work for statics
@@ -135,14 +133,13 @@ rm -r tests/run-make/export # same
135133
# ============
136134
rm -r tests/run-make/extern-fn-explicit-align # argument alignment not yet supported
137135
rm -r tests/run-make/panic-abort-eh_frame # .eh_frame emitted with panic=abort
136+
rm -r tests/run-make/forced-unwind-terminate-pof # adding wrong terminate guard
138137

139138
# bugs in the test suite
140139
# ======================
141140
rm 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)
145141
rm -r tests/ui/codegen/equal-pointers-unequal # make incorrect assumptions about the location of stack variables
142+
rm tests/incremental/extern_static/issue-49153.rs # references undefined symbol
146143

147144
rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
148145
rm tests/ui/intrinsics/panic-uninitialized-zeroed.rs # same
@@ -166,5 +163,5 @@ index 073116933bd..c3e4578204d 100644
166163
EOF
167164

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

0 commit comments

Comments
 (0)