Skip to content

Commit d82b696

Browse files
committed
Update for latests rustc test suite changes
1 parent b023e2f commit d82b696

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

scripts/setup_rust_fork.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,7 @@ popd
6868

6969
# FIXME remove once inline asm is fully supported
7070
export RUSTFLAGS="$RUSTFLAGS --cfg=rustix_use_libc"
71+
72+
# Allow the testsuite to use llvm tools
73+
host_triple=$(rustc -vV | grep host | cut -d: -f2 | tr -d " ")
74+
export LLVM_BIN_DIR="$(rustc --print sysroot)/lib/rustlib/$host_triple/bin"

scripts/test_rustc_tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ rm src/test/ui/test-attrs/test-type.rs # TODO panic message on stderr. correct s
116116
# not sure if this is actually a bug in the test suite, but the symbol list shows the function without leading _ for some reason
117117
rm -r src/test/run-make/native-link-modifier-bundle
118118

119+
rm src/test/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
120+
119121
echo "[TEST] rustc test suite"
120122
RUST_TEST_NOCAPTURE=1 COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 src/test/{codegen-units,run-make,run-pass-valgrind,ui,incremental}
121123
popd

0 commit comments

Comments
 (0)