Rollup merge of #79183 - cuviper:compiletest-test-sysroot, r=Mark-Simulacrum

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.
This commit is contained in:
Dylan DPC 2020-11-19 23:58:40 +01:00 committed by GitHub
commit d5ee4edee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions

View File

@ -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",