bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #135605 - jieyouxu:temp-require-force-rustdoc-js, r=clubby789

Browse source 
bootstrap: still require `COMPILETEST_FORCE_STAGE0` for `./x test rustdoc-js --stage 0`

This PR reverts #135375, because through some more testing I found out `./x test rustdoc-js --stage 0` does not in fact build rustdoc, and all the tests fail. This can't be intended behavior, so at least require `COMPILETEST_FORCE_STAGE0` to make it less likely to run `rustdoc-js --stage 0` by accident.

The problem that `--stage 0` is not working at all for this rustdoc-js test suite is tracked over at #135603.

cc `@lolbinarycat`

r? bootstrap
This commit is contained in:
bors 2025-01-17 01:46:18 +00:00
commit bb3fa4b48e
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/src/core/build_steps/test.rs
View file

@ -1638,10 +1638,7 @@ impl Step for Compiletest {
return; return;
} }
if builder.top_stage == 0 if builder.top_stage == 0 && env::var("COMPILETEST_FORCE_STAGE0").is_err() {
&& env::var("COMPILETEST_FORCE_STAGE0").is_err()
&& self.mode != "js-doc-test"
{
eprintln!("\ eprintln!("\
ERROR: `--stage 0` runs compiletest on the beta compiler, not your local changes, and will almost always cause tests to fail ERROR: `--stage 0` runs compiletest on the beta compiler, not your local changes, and will almost always cause tests to fail
HELP: to test the compiler, use `--stage 1` instead HELP: to test the compiler, use `--stage 1` instead