Skip to content

Commit ca8ed7e

Browse files
authored
Rollup merge of #147188 - Kobzol:remove-compiletest-stage-1, r=Zalathar,jieyouxu
Remove usage of `compiletest-use-stage0-libtest` from CI It shouldn't be needed anymore after #146929. r? `@Zalathar`
2 parents 870657c + 3186902 commit ca8ed7e

File tree

5 files changed

+1
-8
lines changed

5 files changed

+1
-8
lines changed

bootstrap.example.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,9 +476,6 @@
476476
# when the stage 0 compiler is actually built from in-tree sources.
477477
#build.compiletest-allow-stage0 = false
478478

479-
# Whether to use the precompiled stage0 libtest with compiletest.
480-
#build.compiletest-use-stage0-libtest = true
481-
482479
# Default value for the `--extra-checks` flag of tidy.
483480
#
484481
# See `./x test tidy --help` for details.

src/bootstrap/defaults/bootstrap.dist.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ 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
1210

1311
# Most users installing from source want to build all parts of the project from source.
1412
[llvm]

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

Lines changed: 1 addition & 1 deletion
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 check compiletest --set build.compiletest-use-stage0-libtest=true && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
30+
SCRIPT: ./x.py check compiletest && ./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/pr-check-1/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ ENV SCRIPT \
4343
python3 ../x.py check bootstrap && \
4444
/scripts/check-default-config-profiles.sh && \
4545
python3 ../x.py build src/tools/build-manifest && \
46-
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
4746
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
4847
python3 ../x.py check --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 && \
4948
/scripts/validate-toolstate.sh && \

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,4 @@ ENV HOST_TARGET x86_64-unknown-linux-gnu
9090
COPY scripts/shared.sh /scripts/
9191

9292
ENV SCRIPT /tmp/checktools.sh ../x.py && \
93-
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
9493
python3 ../x.py test tests/rustdoc-gui --stage 2 --test-args "'--jobs 1'"

0 commit comments

Comments
 (0)