Auto merge of #99715 - tmiasko:coverage-run-make, r=Mark-Simulacrum

Move coverage tests from run-make-fulldeps to run-make

src/bootstrap/test.rs

@@ -1384,9 +1384,13 @@ note: if you're sure you want to do this, please open an issue as to why. In the
                 .arg(builder.ensure(tool::JsonDocCk { compiler: json_compiler, target }));
         }
 
-        if mode == "run-make" && suite.ends_with("fulldeps") {
+        if mode == "run-make" {
             let rust_demangler = builder
-                .ensure(tool::RustDemangler { compiler, target, extra_features: Vec::new() })
+                .ensure(tool::RustDemangler {
+                    compiler,
+                    target: compiler.host,
+                    extra_features: Vec::new(),
+                })
                 .expect("in-tree tool");
             cmd.arg("--rust-demangler-path").arg(rust_demangler);
         }

src/test/run-make-fulldeps/coverage/compiletest-ignore-dir

@@ -1,3 +0,0 @@
-# Directory "coverage" supports the tests at prefix ../coverage-*
-
-# Use ./x.py [options] test src/test/run-make-fulldeps/coverage to run all related tests.

src/test/run-make-fulldeps/coverage/coverage_tools.mk

@@ -1,6 +0,0 @@
-# Common Makefile include for Rust `run-make-fulldeps/coverage-* tests. Include this
-# file with the line:
-#
-# -include ../coverage/coverage_tools.mk
-
--include ../tools.mk

src/test/run-make/coverage-llvmir/Makefile

@@ -6,7 +6,7 @@
 # version during testing, with an additional directive at the top of this file
 # that sets, for example: `min-llvm-version: 12.0`
 
--include ../coverage/coverage_tools.mk
+include ../coverage/coverage_tools.mk
 
 BASEDIR=../coverage-llvmir
 

src/test/run-make/coverage-reports/Makefile

@@ -10,7 +10,7 @@
 # FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works
 # properly. Since we only have GCC on the CI ignore the test for now.
 
--include ../coverage/coverage_tools.mk
+include ../coverage/coverage_tools.mk
 
 BASEDIR=../coverage-reports
 SOURCEDIR=../coverage

src/test/run-make/coverage/compiletest-ignore-dir

@@ -0,0 +1,3 @@
+# Directory "coverage" supports the tests at prefix ../coverage-*
+
+# Use ./x.py [options] test src/test/run-make/coverage to run all related tests.

src/test/run-make/coverage/coverage_tools.mk

@@ -0,0 +1,6 @@
+# Common Makefile include for Rust `run-make/coverage-* tests. Include this
+# file with the line:
+#
+# include ../coverage/coverage_tools.mk
+
+include ../../run-make-fulldeps/tools.mk