File tree Expand file tree Collapse file tree 4 files changed +6
-2
lines changed Expand file tree Collapse file tree 4 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,8 @@ test-stage = 2
77doc-stage = 2
88# When compiling from source, you usually want all tools.
99extended = true
10+ # Use libtest built from the source tree instead of the precompiled one from stage 0.
11+ compiletest-use-stage0-libtest =false
1012
1113# Most users installing from source want to build all parts of the project from source.
1214[llvm ]
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ runners:
2727 << : *base-job
2828envs :
2929 env-x86_64-apple-tests : &env-x86_64-apple-tests
30- SCRIPT : ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
30+ SCRIPT : ./x.py check compiletest --set build.compiletest-use-stage0-libtest=true && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
3131 RUST_CONFIGURE_ARGS : --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
3232 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
3333 # Ensure that host tooling is tested on our minimum supported macOS version.
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ runners:
5858 << : *base-job
5959envs :
6060 env-x86_64-apple-tests : &env-x86_64-apple-tests
61- SCRIPT : ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
61+ SCRIPT : ./x.py check compiletest --set build.compiletest-use-stage0-libtest=true && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
6262 RUST_CONFIGURE_ARGS : --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
6363 RUSTC_RETRY_LINKER_ON_SEGFAULT : 1
6464 # Ensure that host tooling is tested on our minimum supported macOS version.
Original file line number Diff line number Diff line change 186186 if [ " $NO_DOWNLOAD_CI_RUSTC " = " " ]; then
187187 RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --set rust.download-rustc=if-unchanged"
188188 fi
189+
190+ RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --set build.compiletest-use-stage0-libtest=true"
189191fi
190192
191193if [ " $ENABLE_GCC_CODEGEN " = " 1" ]; then
You can’t perform that action at this time.
0 commit comments