Skip to content

Commit 4e84026

Browse files
committed
Run compiletest self-tests against stage 1 rustc
And move `./x test compiletest --stage=1` to `pr-check-2`, where testing library artifacts already requires building the stage 1 compiler.
1 parent 0ed0c8d commit 4e84026

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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 test --stage 0 src/tools/compiletest && \
4746
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
4847
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
4948
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 && \

src/ci/docker/host-x86_64/pr-check-2/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ ENV SCRIPT \
3030
python3 ../x.py check && \
3131
python3 ../x.py clippy ci && \
3232
python3 ../x.py test --stage 1 core alloc std test proc_macro && \
33+
python3 ../x.py test --stage 1 src/tools/compiletest && \
3334
python3 ../x.py doc --stage 0 bootstrap && \
3435
# Build both public and internal documentation.
3536
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 0 compiler && \
3637
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library && \
3738
mkdir -p /checkout/obj/staging/doc && \
3839
cp -r build/x86_64-unknown-linux-gnu/doc /checkout/obj/staging && \
3940
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library/test && \
40-
# The BOOTSTRAP_TRACING flag is added to verify whether the
41+
# The BOOTSTRAP_TRACING flag is added to verify whether the
4142
# bootstrap process compiles successfully with this flag enabled.
4243
BOOTSTRAP_TRACING=1 python3 ../x.py --help

0 commit comments

Comments
 (0)