diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2025-07-30 19:49:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-30 19:49:03 +0200 |
| commit | 202d1f5bf4b6ab82fa5b84d044670ea3fdfbc158 (patch) | |
| tree | 51d84934aaf1fdaa56b6aebe0ac35a7242812f7a /library/std_detect/src/detect | |
| parent | 175121903a30a664bdf05a974df28d79c15ed63e (diff) | |
| parent | e954253d43d361845c248860e4aa521b90bf6443 (diff) | |
| download | rust-202d1f5bf4b6ab82fa5b84d044670ea3fdfbc158.tar.gz rust-202d1f5bf4b6ab82fa5b84d044670ea3fdfbc158.zip | |
Rollup merge of #144675 - jieyouxu:compiletest-staging, r=Kobzol
Reject running `compiletest` self-tests against stage 0 rustc unless explicitly allowed Currently, in `pr-check-1`, we run `python3 ../x.py test --stage 0 src/tools/compiletest`, which is `compiletest` self-tests against stage 0 rustc. This makes it very annoying for PRs wanting to change target spec JSON format, which `compiletest` depends on for target information, as otherwise `compiletest` would have to know how to handle 2 different target spec JSON formats and know when to pick which. Instead of doing that, we change `compiletest` self-tests to reject running against stage 0 `rustc` *unless* explicitly allowed with `build.compiletest-allow-stage0=true`. `build.compiletest-allow-stage0` is a proper bootstrap config option in favor of the ad-hoc `COMPILETEST_FORCE_STAGE0` env var. This means that: - `./x test src/tools/compiletest --stage=0` is not allowed, unless `build.compiletest-allow-stage0=true` is set. In this scenario, `compiletest` self-tests should be expected to fail unless the stage 0 `rustc` as provided is like codegen_cranelift where it's *actually* built from in-tree `rustc` sources. - In CI, we change `./x test src/tools/compiletest --stage=0` to `./x test src/tools/compiletest --stage=1`, and move it to `pr-check-2`. Yes, this involves building the stage 1 compiler, but `pr-check-2` already has to build stage 1 compiler to test stage 1 library crates. - Crucially, this means that **`compiletest` is only intended to support one target spec JSON format**, namely the one corresponding to the in-tree `rustc`. - This should preserve the `compiletest-use-stage0-libtest` UX optimization where changing `compiler/` tree should still not require rebuilding `compiletest` as long as `build.compiletest-use-stage0-libtest=true`, as that should remain orthogonal. This is completely unlike my previous attempt at https://github.com/rust-lang/rust/pull/144563 that tries to do a way more invasive change which would cause the rebuild problem. Best reviewed commit-by-commit. --- r? `@Kobzol`
Diffstat (limited to 'library/std_detect/src/detect')
0 files changed, 0 insertions, 0 deletions