Skip to content

Commit 875901b

Browse files
committed
Check/test compiletest normally as a staged ToolStd tool
But remove `python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true` from `pr-check-1` and move `./x test compiletest` to the last (and test `compiletest` unit tests against staged compiler/library), as this will require a stage 1 (compiler, library) build to build `compiletest` itself as well.
1 parent 9133b48 commit 875901b

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ 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 test --stage 0 src/tools/compiletest && \
47-
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
4846
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
4947
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 && \
5048
/scripts/validate-toolstate.sh && \
5149
reuse --include-submodules lint && \
52-
python3 ../x.py test collect-license-metadata
50+
python3 ../x.py test collect-license-metadata && \
51+
python3 ../x.py test src/tools/compiletest

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@ 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 && \
93+
python3 ../x.py check compiletest && \
9494
python3 ../x.py test tests/rustdoc-gui --stage 2 --test-args "'--jobs 1'"

src/ci/github-actions/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ runners:
7878

7979
envs:
8080
env-x86_64-apple-tests: &env-x86_64-apple-tests
81-
SCRIPT: ./x.py check compiletest --set build.compiletest-use-stage0-libtest=true && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
81+
SCRIPT: ./x.py check compiletest && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
8282
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
8383
# Ensure that host tooling is tested on our minimum supported macOS version.
8484
MACOSX_DEPLOYMENT_TARGET: 10.12

0 commit comments

Comments
 (0)