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 https://github.com/rust-lang/rust/pull/146929. r? `@Zalathar`
This commit is contained in:
commit
ca8ed7eb80
5 changed files with 1 additions and 8 deletions
|
|
@ -476,9 +476,6 @@
|
|||
# when the stage 0 compiler is actually built from in-tree sources.
|
||||
#build.compiletest-allow-stage0 = false
|
||||
|
||||
# Whether to use the precompiled stage0 libtest with compiletest.
|
||||
#build.compiletest-use-stage0-libtest = true
|
||||
|
||||
# Default value for the `--extra-checks` flag of tidy.
|
||||
#
|
||||
# See `./x test tidy --help` for details.
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@ test-stage = 2
|
|||
doc-stage = 2
|
||||
# When compiling from source, you usually want all tools.
|
||||
extended = true
|
||||
# Use libtest built from the source tree instead of the precompiled one from stage 0.
|
||||
compiletest-use-stage0-libtest = false
|
||||
|
||||
# Most users installing from source want to build all parts of the project from source.
|
||||
[llvm]
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ runners:
|
|||
<<: *base-job
|
||||
envs:
|
||||
env-x86_64-apple-tests: &env-x86_64-apple-tests
|
||||
SCRIPT: ./x.py check compiletest --set build.compiletest-use-stage0-libtest=true && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
|
||||
SCRIPT: ./x.py check compiletest && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
|
||||
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
|
||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||
# Ensure that host tooling is tested on our minimum supported macOS version.
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ ENV SCRIPT \
|
|||
python3 ../x.py check bootstrap && \
|
||||
/scripts/check-default-config-profiles.sh && \
|
||||
python3 ../x.py build src/tools/build-manifest && \
|
||||
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
|
||||
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
|
||||
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 && \
|
||||
/scripts/validate-toolstate.sh && \
|
||||
|
|
|
|||
|
|
@ -90,5 +90,4 @@ ENV HOST_TARGET x86_64-unknown-linux-gnu
|
|||
COPY scripts/shared.sh /scripts/
|
||||
|
||||
ENV SCRIPT /tmp/checktools.sh ../x.py && \
|
||||
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
|
||||
python3 ../x.py test tests/rustdoc-gui --stage 2 --test-args "'--jobs 1'"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue