Skip to content

Commit

Permalink
Auto merge of rust-lang#135605 - jieyouxu:temp-require-force-rustdoc-…
Browse files Browse the repository at this point in the history
…js, r=clubby789

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

This PR reverts rust-lang#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 rust-lang#135603.

cc `@lolbinarycat`

r? bootstrap
  • Loading branch information
bors committed Jan 17, 2025
2 parents 76a030a + 097cb1a commit bb3fa4b
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/bootstrap/src/core/build_steps/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1638,10 +1638,7 @@ impl Step for Compiletest {
return;
}

if builder.top_stage == 0
&& env::var("COMPILETEST_FORCE_STAGE0").is_err()
&& self.mode != "js-doc-test"
{
if builder.top_stage == 0 && env::var("COMPILETEST_FORCE_STAGE0").is_err() {
eprintln!("\
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
Expand Down

0 comments on commit bb3fa4b

Please sign in to comment.