Skip to content

Commit 48e9c4a

Browse files
committed
enable in-tree std on some runners
Signed-off-by: onur-ozkan <[email protected]>
1 parent 1f13ca2 commit 48e9c4a

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

src/bootstrap/defaults/bootstrap.dist.toml

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ test-stage = 2
77
doc-stage = 2
88
# When compiling from source, you usually want all tools.
99
extended = 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]

src/ci/citool/tests/test-jobs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ runners:
2727
<<: *base-job
2828
envs:
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.

src/ci/github-actions/jobs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ runners:
5858
<<: *base-job
5959
envs:
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.

src/ci/run.sh

+2
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ else
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"
189191
fi
190192

191193
if [ "$ENABLE_GCC_CODEGEN" = "1" ]; then

0 commit comments

Comments
 (0)