Commit ca8ed7e

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 ca8ed7eCopy full SHA for ca8ed7e

File tree

-8

lines changed

-8

lines changed

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -476,9 +476,6 @@`
`476`	`476`	`# when the stage 0 compiler is actually built from in-tree sources.`
`477`	`477`	`#build.compiletest-allow-stage0 = false`
`478`	`478`
`479`		`-# Whether to use the precompiled stage0 libtest with compiletest.`
`480`		`-#build.compiletest-use-stage0-libtest = true`
`481`		`-`
`482`	`479`	# Default value for the `--extra-checks` flag of tidy.
`483`	`480`	`#`
`484`	`481`	# See `./x test tidy --help` for details.

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ test-stage = 2`
`7`	`7`	`doc-stage = 2`
`8`	`8`	`# When compiling from source, you usually want all tools.`
`9`	`9`	`extended = true`
`10`		`-# Use libtest built from the source tree instead of the precompiled one from stage 0.`
`11`		`-compiletest-use-stage0-libtest = false`
`12`	`10`
`13`	`11`	`# Most users installing from source want to build all parts of the project from source.`
`14`	`12`	`[llvm]`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ runners:`
`27`	`27`	`<<: *base-job`
`28`	`28`	`envs:`
`29`	`29`	`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`
`31`	`31`	`RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc`
`32`	`32`	`RUSTC_RETRY_LINKER_ON_SEGFAULT: 1`
`33`	`33`	`# Ensure that host tooling is tested on our minimum supported macOS version.`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ ENV SCRIPT \`
`43`	`43`	`python3 ../x.py check bootstrap && \`
`44`	`44`	`/scripts/check-default-config-profiles.sh && \`
`45`	`45`	`python3 ../x.py build src/tools/build-manifest && \`
`46`		`- python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \`
`47`	`46`	`python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \`
`48`	`47`	`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 && \`
`49`	`48`	`/scripts/validate-toolstate.sh && \`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -90,5 +90,4 @@ ENV HOST_TARGET x86_64-unknown-linux-gnu`
`90`	`90`	`COPY scripts/shared.sh /scripts/`
`91`	`91`
`92`	`92`	`ENV SCRIPT /tmp/checktools.sh ../x.py && \`
`93`		`- python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \`
`94`	`93`	`python3 ../x.py test tests/rustdoc-gui --stage 2 --test-args "'--jobs 1'"`

Comments

(0)