Skip to content

Commit c3cfdfc

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

File tree

5 files changed

+6
-2
lines changed

5 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/docker/host-x86_64/mingw-check/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
4747
ENV SCRIPT \
4848
python3 ../x.py check --stage 0 --set build.optimized-compiler-builtins=false core alloc std --target=aarch64-unknown-linux-gnu,i686-pc-windows-msvc,i686-unknown-linux-gnu,x86_64-apple-darwin,x86_64-pc-windows-gnu,x86_64-pc-windows-msvc && \
4949
/scripts/check-default-config-profiles.sh && \
50+
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
5051
python3 ../x.py check --target=x86_64-pc-windows-gnu --host=x86_64-pc-windows-gnu && \
5152
python3 ../x.py clippy ci && \
5253
python3 ../x.py build --stage 0 src/tools/build-manifest && \

src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,5 @@ COPY scripts/shared.sh /scripts/
101101
# the local version of the package is different than the one used by the CI.
102102
ENV SCRIPT /tmp/checktools.sh ../x.py && \
103103
npm install browser-ui-test@$(head -n 1 /tmp/browser-ui-test.version) --unsafe-perm=true && \
104+
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
104105
python3 ../x.py test tests/rustdoc-gui --stage 2 --test-args "'--jobs 1'"

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.

0 commit comments

Comments
 (0)