Skip to content

Commit f8f4f56

Browse files
committed
Re-enable some tests
1 parent 37f3d9e commit f8f4f56

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
@@ -57,6 +52,8 @@ rm tests/ui/asm/x86_64/issue-96797.rs # const and sym inline asm operands don't
5752
rm tests/ui/asm/global-asm-mono-sym-fn.rs # same
5853
rm tests/ui/asm/naked-asm-mono-sym-fn.rs # same
5954
rm tests/ui/asm/x86_64/goto.rs # inline asm labels not supported
55+
rm tests/ui/asm/aarch64/may_unwind.rs # inline asm unwind not supported
56+
rm tests/ui/asm/may_unwind.rs # same
6057
rm tests/ui/simd/simd-bitmask-notpow2.rs # non-pow-of-2 simd vector sizes
6158
rm -r tests/run-make/embed-source-dwarf # embedding sources in debuginfo
6259
rm -r tests/run-make/used-proc-macro # used(linker) isn't supported yet
@@ -80,6 +77,7 @@ rm -r tests/ui/instrument-coverage/
8077
# ==================
8178
rm tests/ui/codegen/issue-28950.rs # depends on stack size optimizations
8279
rm tests/ui/codegen/init-large-type.rs # same
80+
rm tests/ui/codegen/StackColoring-not-blowup-stack-issue-40883.rs # same
8381
rm -r tests/run-make/fmt-write-bloat/ # tests an optimization
8482
rm tests/ui/statics/const_generics.rs # same
8583
rm tests/ui/linking/executable-no-mangle-strip.rs # requires --gc-sections to work for statics
@@ -139,14 +137,13 @@ rm -r tests/run-make/export # same
139137
# ============
140138
rm -r tests/run-make/extern-fn-explicit-align # argument alignment not yet supported
141139
rm -r tests/run-make/panic-abort-eh_frame # .eh_frame emitted with panic=abort
140+
rm -r tests/run-make/forced-unwind-terminate-pof # adding wrong terminate guard
142141

143142
# bugs in the test suite
144143
# ======================
145144
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)
149145
rm -r tests/ui/codegen/equal-pointers-unequal # make incorrect assumptions about the location of stack variables
146+
rm tests/incremental/extern_static/issue-49153.rs # references undefined symbol
150147

151148
rm tests/ui/intrinsics/panic-uninitialized-zeroed.rs # really slow with unoptimized libstd
152149
rm tests/ui/process/process-panic-after-fork.rs # same
@@ -169,5 +166,5 @@ index 073116933bd..c3e4578204d 100644
169166
EOF
170167

171168
echo "[TEST] rustc test suite"
172-
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,run-make,ui,incremental}
173170
popd

0 commit comments

Comments
 (0)