Skip to content

Commit

Permalink
Don't provide rust-demangler to run-make tests
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Zalathar committed Oct 26, 2023
1 parent 7ac9a3a commit 59d4d4e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the
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,
Expand Down
4 changes: 0 additions & 4 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3546,10 +3546,6 @@ impl<'test> TestCx<'test> {
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);
}
Expand Down

0 comments on commit 59d4d4e

Please sign in to comment.