Auto merge of #103196 - Nilstrieb:no-meta-query, r=cjgillot

[rust.git] / src / bootstrap / test.rs

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 2271c18eb1d90d56fc33387ffb6a95e23c2bea25..8d4914097787f920ed1c295c9028f3a81e017cf7 100644 (file)
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -494,16 +494,6 @@ fn run(self, builder: &Builder<'_>) {
         // sysroot does not seem to populate it, so we do that first.
         builder.ensure(compile::Std::new(compiler_std, host));
         let sysroot = builder.sysroot(compiler_std);
-        let mut cargo =
-            builder.cargo(compiler, Mode::ToolRustc, SourceType::Submodule, host, "install");
-        cargo.arg("xargo");
-        // Configure `cargo install` path. cargo adds a `bin/`.
-        cargo.env("CARGO_INSTALL_ROOT", &builder.out);
-
-        let mut cargo = Command::from(cargo);
-        if !try_run(builder, &mut cargo) {
-            return;
-        }
 
         // # Run `cargo miri setup`.
         let mut cargo = tool::prepare_tool_cargo(
@@ -525,8 +515,6 @@ fn run(self, builder: &Builder<'_>) {
         cargo.env("MIRI", &miri);
         // Debug things.
         cargo.env("RUST_BACKTRACE", "1");
-        // Let cargo-miri know where xargo ended up.
-        cargo.env("XARGO_CHECK", builder.out.join("bin").join("xargo-check"));
 
         let mut cargo = Command::from(cargo);
         builder.run(&mut cargo);