Skip to content

Commit

Permalink
Make compiletest testing use the local sysroot
Browse files Browse the repository at this point in the history
We already set `compiletest` to use the local sysroot in rust-lang#68019, but
that missed the configuration for testing `compiletest` itself.
  • Loading branch information
cuviper committed Nov 18, 2020
1 parent 8d2d001 commit 566e877
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -484,10 +484,13 @@ impl Step for CompiletestTest {
let host = self.host;
let compiler = builder.compiler(0, host);

// We need `ToolStd` for the locally-built sysroot because
// compiletest uses unstable features of the `test` crate.
builder.ensure(compile::Std { compiler, target: host });
let cargo = tool::prepare_tool_cargo(
builder,
compiler,
Mode::ToolBootstrap,
Mode::ToolStd,
host,
"test",
"src/tools/compiletest",
Expand Down

0 comments on commit 566e877

Please sign in to comment.