mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't provide rust-demangler to run-make tests

Browse Source 
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.
This commit is contained in:
Zalathar 2023-10-25 19:06:04 +11:00
parent 707d8c3f1b
commit be0d73afec
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/src/core/build_steps/test.rs
View File

@ -1567,7 +1567,7 @@ fn run(self, builder: &Builder<'_>) {
cmd.arg("--coverage-dump-path").arg(coverage_dump); cmd.arg("--coverage-dump-path").arg(coverage_dump);
} }
if mode == "run-make" || mode == "run-coverage" { if mode == "run-coverage" {
let rust_demangler = builder let rust_demangler = builder
.ensure(tool::RustDemangler { .ensure(tool::RustDemangler {
compiler, compiler,

4
src/tools/compiletest/src/runtest.rs
View File

@ -3546,10 +3546,6 @@ fn run_rmake_test(&self) {
cmd.env("RUSTDOC", cwd.join(rustdoc)); 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 { if let Some(ref node) = self.config.nodejs {
cmd.env("NODE", node); cmd.env("NODE", node);
} }