coverage: Migrate tests/coverage-map into tests/coverage

rust-lang · Nov 7, 2023 · 49127c6 · 49127c6
1 parent e9d04c5
commit 49127c6
Show file tree

Hide file tree

Showing 106 changed files with 5 additions and 2,764 deletions.
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
@@ -1433,24 +1433,16 @@ impl Step for Coverage {
     }
 
     fn run(self, builder: &Builder<'_>) {
-        builder.ensure(Compiletest {
-            compiler: self.compiler,
-            target: self.target,
-            mode: "coverage-map",
-            suite: "coverage-map",
-            path: "tests/coverage-map",
-            compare_mode: None,
-        });
+        self.run_unified_suite(builder, CoverageMap::MODE);
         self.run_unified_suite(builder, RunCoverage::MODE);
     }
 }
 
-default_test!(CoverageMap {
-    path: "tests/coverage-map",
-    mode: "coverage-map",
-    suite: "coverage-map"
+coverage_test_alias!(CoverageMap {
+    alias_and_mode: "coverage-map",
+    default: true,
+    only_hosts: false,
 });
-
 coverage_test_alias!(RunCoverage {
     alias_and_mode: "run-coverage",
     default: true,

diff --git a/tests/coverage-map/abort.rs b/tests/coverage-map/abort.rs
diff --git a/tests/coverage-map/assert.rs b/tests/coverage-map/assert.rs
diff --git a/tests/coverage-map/async.rs b/tests/coverage-map/async.rs
diff --git a/tests/coverage-map/async2.rs b/tests/coverage-map/async2.rs
diff --git a/tests/coverage-map/auxiliary/inline_always_with_dead_code.rs b/tests/coverage-map/auxiliary/inline_always_with_dead_code.rs
diff --git a/tests/coverage-map/auxiliary/unused_mod_helper.rs b/tests/coverage-map/auxiliary/unused_mod_helper.rs