Skip to content

Commit 566e877

Browse files
committed
Make compiletest testing use the local sysroot
We already set `compiletest` to use the local sysroot in #68019, but that missed the configuration for testing `compiletest` itself.
1 parent 8d2d001 commit 566e877

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/bootstrap/test.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -484,10 +484,13 @@ impl Step for CompiletestTest {
484484
let host = self.host;
485485
let compiler = builder.compiler(0, host);
486486

487+
// We need `ToolStd` for the locally-built sysroot because
488+
// compiletest uses unstable features of the `test` crate.
489+
builder.ensure(compile::Std { compiler, target: host });
487490
let cargo = tool::prepare_tool_cargo(
488491
builder,
489492
compiler,
490-
Mode::ToolBootstrap,
493+
Mode::ToolStd,
491494
host,
492495
"test",
493496
"src/tools/compiletest",

0 commit comments

Comments
 (0)