Skip to content

Commit bb3fa4b

Browse files
committed
Auto merge of #135605 - jieyouxu:temp-require-force-rustdoc-js, r=clubby789
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
2 parents 76a030a + 097cb1a commit bb3fa4b

File tree

1 file changed

+1
-4
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+1
-4
lines changed

src/bootstrap/src/core/build_steps/test.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1638,10 +1638,7 @@ impl Step for Compiletest {
16381638
return;
16391639
}
16401640

1641-
if builder.top_stage == 0
1642-
&& env::var("COMPILETEST_FORCE_STAGE0").is_err()
1643-
&& self.mode != "js-doc-test"
1644-
{
1641+
if builder.top_stage == 0 && env::var("COMPILETEST_FORCE_STAGE0").is_err() {
16451642
eprintln!("\
16461643
ERROR: `--stage 0` runs compiletest on the beta compiler, not your local changes, and will almost always cause tests to fail
16471644
HELP: to test the compiler, use `--stage 1` instead

0 commit comments

Comments
 (0)