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

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

102 files changed, 17 insertions, 13 deletions

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index fd583da9082..5c8034d53e3 100644
--- a/src/bootstrap/test.rs
+++ b/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);
         }
diff --git a/src/test/run-make-fulldeps/coverage/compiletest-ignore-dir b/src/test/run-make-fulldeps/coverage/compiletest-ignore-dir
deleted file mode 100644
index d1824d189e3..00000000000
--- a/src/test/run-make-fulldeps/coverage/compiletest-ignore-dir
+++ /dev/null
@@ -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.
diff --git a/src/test/run-make-fulldeps/coverage/coverage_tools.mk b/src/test/run-make-fulldeps/coverage/coverage_tools.mk
deleted file mode 100644
index aa1dc7b91ce..00000000000
--- a/src/test/run-make-fulldeps/coverage/coverage_tools.mk
+++ /dev/null
@@ -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
diff --git a/src/test/run-make-fulldeps/coverage-llvmir/Makefile b/src/test/run-make/coverage-llvmir/Makefile
index fbe0a5cb1bb..7be65505332 100644
--- a/src/test/run-make-fulldeps/coverage-llvmir/Makefile
+++ b/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
 
diff --git a/src/test/run-make-fulldeps/coverage-llvmir/filecheck.testprog.txt b/src/test/run-make/coverage-llvmir/filecheck.testprog.txt
index 7a5f2192277..7a5f2192277 100644
--- a/src/test/run-make-fulldeps/coverage-llvmir/filecheck.testprog.txt
+++ b/src/test/run-make/coverage-llvmir/filecheck.testprog.txt
diff --git a/src/test/run-make-fulldeps/coverage-llvmir/testprog.rs b/src/test/run-make/coverage-llvmir/testprog.rs
index 358c25677ae..358c25677ae 100644
--- a/src/test/run-make-fulldeps/coverage-llvmir/testprog.rs
+++ b/src/test/run-make/coverage-llvmir/testprog.rs
diff --git a/src/test/run-make-fulldeps/coverage-reports/Makefile b/src/test/run-make/coverage-reports/Makefile
index 78723e78e77..4e75672f275 100644
--- a/src/test/run-make-fulldeps/coverage-reports/Makefile
+++ b/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
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.abort.txt b/src/test/run-make/coverage-reports/expected_show_coverage.abort.txt
index 00f46f42a07..00f46f42a07 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.abort.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.abort.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.assert.txt b/src/test/run-make/coverage-reports/expected_show_coverage.assert.txt
index 405688806ea..405688806ea 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.assert.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.assert.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async.txt b/src/test/run-make/coverage-reports/expected_show_coverage.async.txt
index 2f69adbd81c..2f69adbd81c 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.async.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async2.txt b/src/test/run-make/coverage-reports/expected_show_coverage.async2.txt
index dc06a485a8f..dc06a485a8f 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async2.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.async2.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure.txt b/src/test/run-make/coverage-reports/expected_show_coverage.closure.txt
index 09ad276aa45..09ad276aa45 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.closure.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro.txt b/src/test/run-make/coverage-reports/expected_show_coverage.closure_macro.txt
index 87f7014760e..87f7014760e 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.closure_macro.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro_async.txt b/src/test/run-make/coverage-reports/expected_show_coverage.closure_macro_async.txt
index 2b5418132c3..2b5418132c3 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro_async.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.closure_macro_async.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.conditions.txt b/src/test/run-make/coverage-reports/expected_show_coverage.conditions.txt
index 2d8a98a5d0c..2d8a98a5d0c 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.conditions.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.conditions.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.continue.txt b/src/test/run-make/coverage-reports/expected_show_coverage.continue.txt
index 1c64ead9f26..1c64ead9f26 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.continue.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.continue.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.dead_code.txt b/src/test/run-make/coverage-reports/expected_show_coverage.dead_code.txt
index 09ff14c6f27..09ff14c6f27 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.dead_code.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.dead_code.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.doctest.txt b/src/test/run-make/coverage-reports/expected_show_coverage.doctest.txt
index 7ae0e978808..7ae0e978808 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.doctest.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.doctest.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.drop_trait.txt b/src/test/run-make/coverage-reports/expected_show_coverage.drop_trait.txt
index fe6a9e93cbf..fe6a9e93cbf 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.drop_trait.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.drop_trait.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generator.txt b/src/test/run-make/coverage-reports/expected_show_coverage.generator.txt
index d70e12e4128..d70e12e4128 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generator.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.generator.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generics.txt b/src/test/run-make/coverage-reports/expected_show_coverage.generics.txt
index 48983ba4358..48983ba4358 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generics.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.generics.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if.txt b/src/test/run-make/coverage-reports/expected_show_coverage.if.txt
index 0c9eff227ed..0c9eff227ed 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.if.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if_else.txt b/src/test/run-make/coverage-reports/expected_show_coverage.if_else.txt
index 4285d318686..4285d318686 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if_else.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.if_else.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline-dead.txt b/src/test/run-make/coverage-reports/expected_show_coverage.inline-dead.txt
index effdef80e8e..effdef80e8e 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline-dead.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.inline-dead.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline.txt b/src/test/run-make/coverage-reports/expected_show_coverage.inline.txt
index 6f5d1544fa0..6f5d1544fa0 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.inline.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inner_items.txt b/src/test/run-make/coverage-reports/expected_show_coverage.inner_items.txt
index 883254a09ba..883254a09ba 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inner_items.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.inner_items.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-83601.txt b/src/test/run-make/coverage-reports/expected_show_coverage.issue-83601.txt
index de32c88b725..de32c88b725 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-83601.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.issue-83601.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-84561.txt b/src/test/run-make/coverage-reports/expected_show_coverage.issue-84561.txt
index f24f7c69404..f24f7c69404 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-84561.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.issue-84561.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-85461.txt b/src/test/run-make/coverage-reports/expected_show_coverage.issue-85461.txt
index 1aa4a22c33e..1aa4a22c33e 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-85461.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.issue-85461.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-93054.txt b/src/test/run-make/coverage-reports/expected_show_coverage.issue-93054.txt
index a1655adedd4..a1655adedd4 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-93054.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.issue-93054.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.lazy_boolean.txt b/src/test/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt
index bd349df2fbc..bd349df2fbc 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.lazy_boolean.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loop_break_value.txt b/src/test/run-make/coverage-reports/expected_show_coverage.loop_break_value.txt
index 022fe4c5962..022fe4c5962 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loop_break_value.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.loop_break_value.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loops_branches.txt b/src/test/run-make/coverage-reports/expected_show_coverage.loops_branches.txt
index b7ad79a2484..b7ad79a2484 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loops_branches.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.loops_branches.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.match_or_pattern.txt b/src/test/run-make/coverage-reports/expected_show_coverage.match_or_pattern.txt
index a0fccb24f99..a0fccb24f99 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.match_or_pattern.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.match_or_pattern.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.nested_loops.txt b/src/test/run-make/coverage-reports/expected_show_coverage.nested_loops.txt
index 0dbd6bcf313..0dbd6bcf313 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.nested_loops.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.nested_loops.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.no_cov_crate.txt b/src/test/run-make/coverage-reports/expected_show_coverage.no_cov_crate.txt
index 83a9204136f..83a9204136f 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.no_cov_crate.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.no_cov_crate.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.overflow.txt b/src/test/run-make/coverage-reports/expected_show_coverage.overflow.txt
index 25e822bffd1..25e822bffd1 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.overflow.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.overflow.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.panic_unwind.txt b/src/test/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt
index 114507dc9fd..114507dc9fd 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.panic_unwind.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.partial_eq.txt b/src/test/run-make/coverage-reports/expected_show_coverage.partial_eq.txt
index fc266653349..fc266653349 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.partial_eq.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.partial_eq.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_loop.txt b/src/test/run-make/coverage-reports/expected_show_coverage.simple_loop.txt
index feb83bad674..feb83bad674 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_loop.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.simple_loop.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_match.txt b/src/test/run-make/coverage-reports/expected_show_coverage.simple_match.txt
index b9298213111..b9298213111 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_match.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.simple_match.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.tight_inf_loop.txt b/src/test/run-make/coverage-reports/expected_show_coverage.tight_inf_loop.txt
index 2d4c57f451a..2d4c57f451a 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.tight_inf_loop.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.tight_inf_loop.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.try_error_result.txt b/src/test/run-make/coverage-reports/expected_show_coverage.try_error_result.txt
index 0ad0180b761..0ad0180b761 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.try_error_result.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.try_error_result.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused.txt b/src/test/run-make/coverage-reports/expected_show_coverage.unused.txt
index 15fcf21c0ef..15fcf21c0ef 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.unused.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused_mod.txt b/src/test/run-make/coverage-reports/expected_show_coverage.unused_mod.txt
index 82d6fccc271..82d6fccc271 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused_mod.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.unused_mod.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_crate.txt b/src/test/run-make/coverage-reports/expected_show_coverage.uses_crate.txt
index 65eb1008dd8..65eb1008dd8 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_crate.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.uses_crate.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_inline_crate.txt b/src/test/run-make/coverage-reports/expected_show_coverage.uses_inline_crate.txt
index dab31cbf4ac..dab31cbf4ac 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_inline_crate.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.uses_inline_crate.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while.txt b/src/test/run-make/coverage-reports/expected_show_coverage.while.txt
index efa7d083f0c..efa7d083f0c 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.while.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while_early_ret.txt b/src/test/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt
index d19afc0de61..d19afc0de61 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while_early_ret.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.yield.txt b/src/test/run-make/coverage-reports/expected_show_coverage.yield.txt
index 60a8d943f1f..60a8d943f1f 100644
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.yield.txt
+++ b/src/test/run-make/coverage-reports/expected_show_coverage.yield.txt
diff --git a/src/test/run-make-fulldeps/coverage-reports/normalize_paths.py b/src/test/run-make/coverage-reports/normalize_paths.py
index e5777ad2512..e5777ad2512 100755
--- a/src/test/run-make-fulldeps/coverage-reports/normalize_paths.py
+++ b/src/test/run-make/coverage-reports/normalize_paths.py
diff --git a/src/test/run-make-fulldeps/coverage/WARNING_KEEP_NAMES_SHORT.txt b/src/test/run-make/coverage/WARNING_KEEP_NAMES_SHORT.txt
index 6a1403b8a00..6a1403b8a00 100644
--- a/src/test/run-make-fulldeps/coverage/WARNING_KEEP_NAMES_SHORT.txt
+++ b/src/test/run-make/coverage/WARNING_KEEP_NAMES_SHORT.txt
diff --git a/src/test/run-make-fulldeps/coverage/abort.rs b/src/test/run-make/coverage/abort.rs
index 3dac43df8f3..3dac43df8f3 100644
--- a/src/test/run-make-fulldeps/coverage/abort.rs
+++ b/src/test/run-make/coverage/abort.rs
diff --git a/src/test/run-make-fulldeps/coverage/assert.rs b/src/test/run-make/coverage/assert.rs
index c85f2748eb9..c85f2748eb9 100644
--- a/src/test/run-make-fulldeps/coverage/assert.rs
+++ b/src/test/run-make/coverage/assert.rs
diff --git a/src/test/run-make-fulldeps/coverage/async.rs b/src/test/run-make/coverage/async.rs
index a6e38774706..a6e38774706 100644
--- a/src/test/run-make-fulldeps/coverage/async.rs
+++ b/src/test/run-make/coverage/async.rs
diff --git a/src/test/run-make-fulldeps/coverage/async2.rs b/src/test/run-make/coverage/async2.rs
index 959d48ce9db..959d48ce9db 100644
--- a/src/test/run-make-fulldeps/coverage/async2.rs
+++ b/src/test/run-make/coverage/async2.rs
diff --git a/src/test/run-make-fulldeps/coverage/closure.rs b/src/test/run-make/coverage/closure.rs
index 32ec0bcdf8c..32ec0bcdf8c 100644
--- a/src/test/run-make-fulldeps/coverage/closure.rs
+++ b/src/test/run-make/coverage/closure.rs
diff --git a/src/test/run-make-fulldeps/coverage/closure_macro.rs b/src/test/run-make/coverage/closure_macro.rs
index 5e3b00d1ef5..5e3b00d1ef5 100644
--- a/src/test/run-make-fulldeps/coverage/closure_macro.rs
+++ b/src/test/run-make/coverage/closure_macro.rs
diff --git a/src/test/run-make-fulldeps/coverage/closure_macro_async.rs b/src/test/run-make/coverage/closure_macro_async.rs
index e3e89e9c8b3..e3e89e9c8b3 100644
--- a/src/test/run-make-fulldeps/coverage/closure_macro_async.rs
+++ b/src/test/run-make/coverage/closure_macro_async.rs
diff --git a/src/test/run-make/coverage/compiletest-ignore-dir b/src/test/run-make/coverage/compiletest-ignore-dir
new file mode 100644
index 00000000000..b533b272d38
--- /dev/null
+++ b/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.
diff --git a/src/test/run-make-fulldeps/coverage/conditions.rs b/src/test/run-make/coverage/conditions.rs
index 057599d1b47..057599d1b47 100644
--- a/src/test/run-make-fulldeps/coverage/conditions.rs
+++ b/src/test/run-make/coverage/conditions.rs
diff --git a/src/test/run-make-fulldeps/coverage/continue.rs b/src/test/run-make/coverage/continue.rs
index 624aa98341b..624aa98341b 100644
--- a/src/test/run-make-fulldeps/coverage/continue.rs
+++ b/src/test/run-make/coverage/continue.rs
diff --git a/src/test/run-make/coverage/coverage_tools.mk b/src/test/run-make/coverage/coverage_tools.mk
new file mode 100644
index 00000000000..0b6bbc33167
--- /dev/null
+++ b/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
diff --git a/src/test/run-make-fulldeps/coverage/dead_code.rs b/src/test/run-make/coverage/dead_code.rs
index a1285df0ec6..a1285df0ec6 100644
--- a/src/test/run-make-fulldeps/coverage/dead_code.rs
+++ b/src/test/run-make/coverage/dead_code.rs
diff --git a/src/test/run-make-fulldeps/coverage/doctest.rs b/src/test/run-make/coverage/doctest.rs
index ec04ea57063..ec04ea57063 100644
--- a/src/test/run-make-fulldeps/coverage/doctest.rs
+++ b/src/test/run-make/coverage/doctest.rs
diff --git a/src/test/run-make-fulldeps/coverage/drop_trait.rs b/src/test/run-make/coverage/drop_trait.rs
index d15bfc0f877..d15bfc0f877 100644
--- a/src/test/run-make-fulldeps/coverage/drop_trait.rs
+++ b/src/test/run-make/coverage/drop_trait.rs
diff --git a/src/test/run-make-fulldeps/coverage/generator.rs b/src/test/run-make/coverage/generator.rs
index 4319991021e..4319991021e 100644
--- a/src/test/run-make-fulldeps/coverage/generator.rs
+++ b/src/test/run-make/coverage/generator.rs
diff --git a/src/test/run-make-fulldeps/coverage/generics.rs b/src/test/run-make/coverage/generics.rs
index 18b38868496..18b38868496 100644
--- a/src/test/run-make-fulldeps/coverage/generics.rs
+++ b/src/test/run-make/coverage/generics.rs
diff --git a/src/test/run-make-fulldeps/coverage/if.rs b/src/test/run-make/coverage/if.rs
index 8ad5042ff7b..8ad5042ff7b 100644
--- a/src/test/run-make-fulldeps/coverage/if.rs
+++ b/src/test/run-make/coverage/if.rs
diff --git a/src/test/run-make-fulldeps/coverage/if_else.rs b/src/test/run-make/coverage/if_else.rs
index 3244e1e3afd..3244e1e3afd 100644
--- a/src/test/run-make-fulldeps/coverage/if_else.rs
+++ b/src/test/run-make/coverage/if_else.rs
diff --git a/src/test/run-make-fulldeps/coverage/inline-dead.rs b/src/test/run-make/coverage/inline-dead.rs
index 854fa062967..854fa062967 100644
--- a/src/test/run-make-fulldeps/coverage/inline-dead.rs
+++ b/src/test/run-make/coverage/inline-dead.rs
diff --git a/src/test/run-make-fulldeps/coverage/inline.rs b/src/test/run-make/coverage/inline.rs
index 9cfab9ddbad..9cfab9ddbad 100644
--- a/src/test/run-make-fulldeps/coverage/inline.rs
+++ b/src/test/run-make/coverage/inline.rs
diff --git a/src/test/run-make-fulldeps/coverage/inner_items.rs b/src/test/run-make/coverage/inner_items.rs
index bcb62b3031c..bcb62b3031c 100644
--- a/src/test/run-make-fulldeps/coverage/inner_items.rs
+++ b/src/test/run-make/coverage/inner_items.rs
diff --git a/src/test/run-make-fulldeps/coverage/issue-83601.rs b/src/test/run-make/coverage/issue-83601.rs
index 0b72a81947c..0b72a81947c 100644
--- a/src/test/run-make-fulldeps/coverage/issue-83601.rs
+++ b/src/test/run-make/coverage/issue-83601.rs
diff --git a/src/test/run-make-fulldeps/coverage/issue-84561.rs b/src/test/run-make/coverage/issue-84561.rs
index b39a289c45e..b39a289c45e 100644
--- a/src/test/run-make-fulldeps/coverage/issue-84561.rs
+++ b/src/test/run-make/coverage/issue-84561.rs
diff --git a/src/test/run-make-fulldeps/coverage/issue-85461.rs b/src/test/run-make/coverage/issue-85461.rs
index a1b9ebb1ed3..a1b9ebb1ed3 100644
--- a/src/test/run-make-fulldeps/coverage/issue-85461.rs
+++ b/src/test/run-make/coverage/issue-85461.rs
diff --git a/src/test/run-make-fulldeps/coverage/issue-93054.rs b/src/test/run-make/coverage/issue-93054.rs
index c160b3db03f..c160b3db03f 100644
--- a/src/test/run-make-fulldeps/coverage/issue-93054.rs
+++ b/src/test/run-make/coverage/issue-93054.rs
diff --git a/src/test/run-make-fulldeps/coverage/lazy_boolean.rs b/src/test/run-make/coverage/lazy_boolean.rs
index bb6219e851c..bb6219e851c 100644
--- a/src/test/run-make-fulldeps/coverage/lazy_boolean.rs
+++ b/src/test/run-make/coverage/lazy_boolean.rs
diff --git a/src/test/run-make-fulldeps/coverage/lib/doctest_crate.rs b/src/test/run-make/coverage/lib/doctest_crate.rs
index c3210146d69..c3210146d69 100644
--- a/src/test/run-make-fulldeps/coverage/lib/doctest_crate.rs
+++ b/src/test/run-make/coverage/lib/doctest_crate.rs
diff --git a/src/test/run-make-fulldeps/coverage/lib/inline_always_with_dead_code.rs b/src/test/run-make/coverage/lib/inline_always_with_dead_code.rs
index 2b21dee6ccf..2b21dee6ccf 100644
--- a/src/test/run-make-fulldeps/coverage/lib/inline_always_with_dead_code.rs
+++ b/src/test/run-make/coverage/lib/inline_always_with_dead_code.rs
diff --git a/src/test/run-make-fulldeps/coverage/lib/unused_mod_helper.rs b/src/test/run-make/coverage/lib/unused_mod_helper.rs
index ae1cc1531ed..ae1cc1531ed 100644
--- a/src/test/run-make-fulldeps/coverage/lib/unused_mod_helper.rs
+++ b/src/test/run-make/coverage/lib/unused_mod_helper.rs
diff --git a/src/test/run-make-fulldeps/coverage/lib/used_crate.rs b/src/test/run-make/coverage/lib/used_crate.rs
index 8b8b1f7f351..8b8b1f7f351 100644
--- a/src/test/run-make-fulldeps/coverage/lib/used_crate.rs
+++ b/src/test/run-make/coverage/lib/used_crate.rs
diff --git a/src/test/run-make-fulldeps/coverage/lib/used_inline_crate.rs b/src/test/run-make/coverage/lib/used_inline_crate.rs
index 4a052756d4e..4a052756d4e 100644
--- a/src/test/run-make-fulldeps/coverage/lib/used_inline_crate.rs
+++ b/src/test/run-make/coverage/lib/used_inline_crate.rs
diff --git a/src/test/run-make-fulldeps/coverage/loop_break_value.rs b/src/test/run-make/coverage/loop_break_value.rs
index dbc4fad7a23..dbc4fad7a23 100644
--- a/src/test/run-make-fulldeps/coverage/loop_break_value.rs
+++ b/src/test/run-make/coverage/loop_break_value.rs
diff --git a/src/test/run-make-fulldeps/coverage/loops_branches.rs b/src/test/run-make/coverage/loops_branches.rs
index 7116ce47f4b..7116ce47f4b 100644
--- a/src/test/run-make-fulldeps/coverage/loops_branches.rs
+++ b/src/test/run-make/coverage/loops_branches.rs
diff --git a/src/test/run-make-fulldeps/coverage/match_or_pattern.rs b/src/test/run-make/coverage/match_or_pattern.rs
index 4c6a8a9b703..4c6a8a9b703 100644
--- a/src/test/run-make-fulldeps/coverage/match_or_pattern.rs
+++ b/src/test/run-make/coverage/match_or_pattern.rs
diff --git a/src/test/run-make-fulldeps/coverage/nested_loops.rs b/src/test/run-make/coverage/nested_loops.rs
index 4c7c7842796..4c7c7842796 100644
--- a/src/test/run-make-fulldeps/coverage/nested_loops.rs
+++ b/src/test/run-make/coverage/nested_loops.rs
diff --git a/src/test/run-make-fulldeps/coverage/no_cov_crate.rs b/src/test/run-make/coverage/no_cov_crate.rs
index 0bfbdda2cab..0bfbdda2cab 100644
--- a/src/test/run-make-fulldeps/coverage/no_cov_crate.rs
+++ b/src/test/run-make/coverage/no_cov_crate.rs
diff --git a/src/test/run-make-fulldeps/coverage/overflow.rs b/src/test/run-make/coverage/overflow.rs
index e537b0e95c3..e537b0e95c3 100644
--- a/src/test/run-make-fulldeps/coverage/overflow.rs
+++ b/src/test/run-make/coverage/overflow.rs
diff --git a/src/test/run-make-fulldeps/coverage/panic_unwind.rs b/src/test/run-make/coverage/panic_unwind.rs
index 03128c2cce6..03128c2cce6 100644
--- a/src/test/run-make-fulldeps/coverage/panic_unwind.rs
+++ b/src/test/run-make/coverage/panic_unwind.rs
diff --git a/src/test/run-make-fulldeps/coverage/partial_eq.rs b/src/test/run-make/coverage/partial_eq.rs
index 4ceaba9b111..4ceaba9b111 100644
--- a/src/test/run-make-fulldeps/coverage/partial_eq.rs
+++ b/src/test/run-make/coverage/partial_eq.rs
diff --git a/src/test/run-make-fulldeps/coverage/simple_loop.rs b/src/test/run-make/coverage/simple_loop.rs
index 6f7f23475b8..6f7f23475b8 100644
--- a/src/test/run-make-fulldeps/coverage/simple_loop.rs
+++ b/src/test/run-make/coverage/simple_loop.rs
diff --git a/src/test/run-make-fulldeps/coverage/simple_match.rs b/src/test/run-make/coverage/simple_match.rs
index be99e59a826..be99e59a826 100644
--- a/src/test/run-make-fulldeps/coverage/simple_match.rs
+++ b/src/test/run-make/coverage/simple_match.rs
diff --git a/src/test/run-make-fulldeps/coverage/tight_inf_loop.rs b/src/test/run-make/coverage/tight_inf_loop.rs
index cef99027aaa..cef99027aaa 100644
--- a/src/test/run-make-fulldeps/coverage/tight_inf_loop.rs
+++ b/src/test/run-make/coverage/tight_inf_loop.rs
diff --git a/src/test/run-make-fulldeps/coverage/try_error_result.rs b/src/test/run-make/coverage/try_error_result.rs
index cd0acf72302..cd0acf72302 100644
--- a/src/test/run-make-fulldeps/coverage/try_error_result.rs
+++ b/src/test/run-make/coverage/try_error_result.rs
diff --git a/src/test/run-make-fulldeps/coverage/unused.rs b/src/test/run-make/coverage/unused.rs
index fb6113eb01c..fb6113eb01c 100644
--- a/src/test/run-make-fulldeps/coverage/unused.rs
+++ b/src/test/run-make/coverage/unused.rs
diff --git a/src/test/run-make-fulldeps/coverage/unused_mod.rs b/src/test/run-make/coverage/unused_mod.rs
index 679b4e53188..679b4e53188 100644
--- a/src/test/run-make-fulldeps/coverage/unused_mod.rs
+++ b/src/test/run-make/coverage/unused_mod.rs
diff --git a/src/test/run-make-fulldeps/coverage/uses_crate.rs b/src/test/run-make/coverage/uses_crate.rs
index 20cb05fe5b0..20cb05fe5b0 100644
--- a/src/test/run-make-fulldeps/coverage/uses_crate.rs
+++ b/src/test/run-make/coverage/uses_crate.rs
diff --git a/src/test/run-make-fulldeps/coverage/uses_inline_crate.rs b/src/test/run-make/coverage/uses_inline_crate.rs
index a7fe8532be3..a7fe8532be3 100644
--- a/src/test/run-make-fulldeps/coverage/uses_inline_crate.rs
+++ b/src/test/run-make/coverage/uses_inline_crate.rs
diff --git a/src/test/run-make-fulldeps/coverage/while.rs b/src/test/run-make/coverage/while.rs
index 781b90b3566..781b90b3566 100644
--- a/src/test/run-make-fulldeps/coverage/while.rs
+++ b/src/test/run-make/coverage/while.rs
diff --git a/src/test/run-make-fulldeps/coverage/while_early_ret.rs b/src/test/run-make/coverage/while_early_ret.rs
index 1fcea9c85c4..1fcea9c85c4 100644
--- a/src/test/run-make-fulldeps/coverage/while_early_ret.rs
+++ b/src/test/run-make/coverage/while_early_ret.rs
diff --git a/src/test/run-make-fulldeps/coverage/yield.rs b/src/test/run-make/coverage/yield.rs
index ff7616656ff..ff7616656ff 100644
--- a/src/test/run-make-fulldeps/coverage/yield.rs
+++ b/src/test/run-make/coverage/yield.rs