From be0d73afec845d938899bf153a092d675288c79a Mon Sep 17 00:00:00 2001 From: Zalathar Date: Wed, 25 Oct 2023 19:06:04 +1100 Subject: [PATCH] Don't provide `rust-demangler` to run-make tests The demangler was only needed by coverage tests, but those tests were migrated into their own custom test mode in #112300. This avoids having to build the demangler just for run-make tests. It will still be built as needed by run-coverage tests or for other purposes. --- src/bootstrap/src/core/build_steps/test.rs | 2 +- src/tools/compiletest/src/runtest.rs | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs index 27eac212b14..f2284b8a4ba 100644 --- a/src/bootstrap/src/core/build_steps/test.rs +++ b/src/bootstrap/src/core/build_steps/test.rs @@ -1567,7 +1567,7 @@ fn run(self, builder: &Builder<'_>) { cmd.arg("--coverage-dump-path").arg(coverage_dump); } - if mode == "run-make" || mode == "run-coverage" { + if mode == "run-coverage" { let rust_demangler = builder .ensure(tool::RustDemangler { compiler, diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 87d0404e7d8..e74d66a8599 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -3546,10 +3546,6 @@ fn run_rmake_test(&self) { cmd.env("RUSTDOC", cwd.join(rustdoc)); } - if let Some(ref rust_demangler) = self.config.rust_demangler_path { - cmd.env("RUST_DEMANGLER", cwd.join(rust_demangler)); - } - if let Some(ref node) = self.config.nodejs { cmd.env("NODE", node); }