Skip to content

Commit be0d73a

Browse files
committed
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 rust-lang#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.
1 parent 707d8c3 commit be0d73a

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

src/bootstrap/src/core/build_steps/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the
15671567
cmd.arg("--coverage-dump-path").arg(coverage_dump);
15681568
}
15691569

1570-
if mode == "run-make" || mode == "run-coverage" {
1570+
if mode == "run-coverage" {
15711571
let rust_demangler = builder
15721572
.ensure(tool::RustDemangler {
15731573
compiler,

src/tools/compiletest/src/runtest.rs

-4
Original file line numberDiff line numberDiff line change
@@ -3546,10 +3546,6 @@ impl<'test> TestCx<'test> {
35463546
cmd.env("RUSTDOC", cwd.join(rustdoc));
35473547
}
35483548

3549-
if let Some(ref rust_demangler) = self.config.rust_demangler_path {
3550-
cmd.env("RUST_DEMANGLER", cwd.join(rust_demangler));
3551-
}
3552-
35533549
if let Some(ref node) = self.config.nodejs {
35543550
cmd.env("NODE", node);
35553551
}

0 commit comments

Comments
 (0)