diff options
| author | bors <bors@rust-lang.org> | 2025-01-17 01:46:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-17 01:46:18 +0000 |
| commit | bb3fa4b48eef8dc0815b0464e56f1fb82fe2cdfc (patch) | |
| tree | 6c9a84c011b7d67e7848cb3e72ffbd1acf3ea6a5 | |
| parent | 76a030a6c2dab11760cb08d746fa515e4bce5d39 (diff) | |
| parent | 097cb1a9559f9e1cd7d4a41f5f214070a678bbc2 (diff) | |
| download | rust-bb3fa4b48eef8dc0815b0464e56f1fb82fe2cdfc.tar.gz rust-bb3fa4b48eef8dc0815b0464e56f1fb82fe2cdfc.zip | |
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
| -rw-r--r-- | src/bootstrap/src/core/build_steps/test.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs index fdc1f30b859..9f3e4d9cc89 100644 --- a/src/bootstrap/src/core/build_steps/test.rs +++ b/src/bootstrap/src/core/build_steps/test.rs @@ -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 |