coverage: Migrate tests/run-coverage into tests/coverage

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

Hide file tree

Showing 105 changed files with 7 additions and 9 deletions.
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
@@ -1441,14 +1441,7 @@ impl Step for Coverage {
             path: "tests/coverage-map",
             compare_mode: None,
         });
-        builder.ensure(Compiletest {
-            compiler: self.compiler,
-            target: self.target,
-            mode: "run-coverage",
-            suite: "run-coverage",
-            path: "tests/run-coverage",
-            compare_mode: None,
-        });
+        self.run_unified_suite(builder, RunCoverage::MODE);
     }
 }
 
@@ -1458,7 +1451,12 @@ default_test!(CoverageMap {
     suite: "coverage-map"
 });
 
-host_test!(RunCoverage { path: "tests/run-coverage", mode: "run-coverage", suite: "run-coverage" });
+coverage_test_alias!(RunCoverage {
+    alias_and_mode: "run-coverage",
+    default: true,
+    only_hosts: true,
+});
+
 host_test!(RunCoverageRustdoc {
     path: "tests/run-coverage-rustdoc",
     mode: "run-coverage",

diff --git a/tests/run-coverage/abort.coverage → tests/coverage/abort.coverage b/tests/run-coverage/abort.coverage → tests/coverage/abort.coverage
diff --git a/tests/run-coverage/abort.rs → tests/coverage/abort.rs b/tests/run-coverage/abort.rs → tests/coverage/abort.rs
diff --git a/tests/run-coverage/assert.coverage → tests/coverage/assert.coverage b/tests/run-coverage/assert.coverage → tests/coverage/assert.coverage
diff --git a/tests/run-coverage/assert.rs → tests/coverage/assert.rs b/tests/run-coverage/assert.rs → tests/coverage/assert.rs
diff --git a/tests/run-coverage/async.coverage → tests/coverage/async.coverage b/tests/run-coverage/async.coverage → tests/coverage/async.coverage
diff --git a/tests/run-coverage/async.rs → tests/coverage/async.rs b/tests/run-coverage/async.rs → tests/coverage/async.rs
diff --git a/tests/run-coverage/async2.coverage → tests/coverage/async2.coverage b/tests/run-coverage/async2.coverage → tests/coverage/async2.coverage
diff --git a/tests/run-coverage/async2.rs → tests/coverage/async2.rs b/tests/run-coverage/async2.rs → tests/coverage/async2.rs
diff --git a/...auxiliary/inline_always_with_dead_code.rs → ...auxiliary/inline_always_with_dead_code.rs b/...auxiliary/inline_always_with_dead_code.rs → ...auxiliary/inline_always_with_dead_code.rs
diff --git a/...n-coverage/auxiliary/unused_mod_helper.rs → ...s/coverage/auxiliary/unused_mod_helper.rs b/...n-coverage/auxiliary/unused_mod_helper.rs → ...s/coverage/auxiliary/unused_mod_helper.rs
diff --git a/tests/run-coverage/auxiliary/used_crate.rs → tests/coverage/auxiliary/used_crate.rs b/tests/run-coverage/auxiliary/used_crate.rs → tests/coverage/auxiliary/used_crate.rs
diff --git a/...n-coverage/auxiliary/used_inline_crate.rs → ...s/coverage/auxiliary/used_inline_crate.rs b/...n-coverage/auxiliary/used_inline_crate.rs → ...s/coverage/auxiliary/used_inline_crate.rs
diff --git a/tests/run-coverage/bad_counter_ids.coverage → tests/coverage/bad_counter_ids.coverage b/tests/run-coverage/bad_counter_ids.coverage → tests/coverage/bad_counter_ids.coverage
diff --git a/tests/run-coverage/bad_counter_ids.rs → tests/coverage/bad_counter_ids.rs b/tests/run-coverage/bad_counter_ids.rs → tests/coverage/bad_counter_ids.rs
diff --git a/tests/run-coverage/closure.coverage → tests/coverage/closure.coverage b/tests/run-coverage/closure.coverage → tests/coverage/closure.coverage
diff --git a/tests/run-coverage/closure.rs → tests/coverage/closure.rs b/tests/run-coverage/closure.rs → tests/coverage/closure.rs
diff --git a/tests/run-coverage/closure_bug.coverage → tests/coverage/closure_bug.coverage b/tests/run-coverage/closure_bug.coverage → tests/coverage/closure_bug.coverage
diff --git a/tests/run-coverage/closure_bug.rs → tests/coverage/closure_bug.rs b/tests/run-coverage/closure_bug.rs → tests/coverage/closure_bug.rs
diff --git a/tests/run-coverage/closure_macro.coverage → tests/coverage/closure_macro.coverage b/tests/run-coverage/closure_macro.coverage → tests/coverage/closure_macro.coverage
diff --git a/tests/run-coverage/closure_macro.rs → tests/coverage/closure_macro.rs b/tests/run-coverage/closure_macro.rs → tests/coverage/closure_macro.rs
diff --git a/...run-coverage/closure_macro_async.coverage → tests/coverage/closure_macro_async.coverage b/...run-coverage/closure_macro_async.coverage → tests/coverage/closure_macro_async.coverage
diff --git a/tests/run-coverage/closure_macro_async.rs → tests/coverage/closure_macro_async.rs b/tests/run-coverage/closure_macro_async.rs → tests/coverage/closure_macro_async.rs
diff --git a/tests/run-coverage/conditions.coverage → tests/coverage/conditions.coverage b/tests/run-coverage/conditions.coverage → tests/coverage/conditions.coverage
diff --git a/tests/run-coverage/conditions.rs → tests/coverage/conditions.rs b/tests/run-coverage/conditions.rs → tests/coverage/conditions.rs
diff --git a/tests/run-coverage/continue.coverage → tests/coverage/continue.coverage b/tests/run-coverage/continue.coverage → tests/coverage/continue.coverage
diff --git a/tests/run-coverage/continue.rs → tests/coverage/continue.rs b/tests/run-coverage/continue.rs → tests/coverage/continue.rs
diff --git a/tests/run-coverage/coroutine.coverage → tests/coverage/coroutine.coverage b/tests/run-coverage/coroutine.coverage → tests/coverage/coroutine.coverage
diff --git a/tests/run-coverage/coroutine.rs → tests/coverage/coroutine.rs b/tests/run-coverage/coroutine.rs → tests/coverage/coroutine.rs
diff --git a/tests/run-coverage/dead_code.coverage → tests/coverage/dead_code.coverage b/tests/run-coverage/dead_code.coverage → tests/coverage/dead_code.coverage
diff --git a/tests/run-coverage/dead_code.rs → tests/coverage/dead_code.rs b/tests/run-coverage/dead_code.rs → tests/coverage/dead_code.rs
diff --git a/tests/run-coverage/drop_trait.coverage → tests/coverage/drop_trait.coverage b/tests/run-coverage/drop_trait.coverage → tests/coverage/drop_trait.coverage
diff --git a/tests/run-coverage/drop_trait.rs → tests/coverage/drop_trait.rs b/tests/run-coverage/drop_trait.rs → tests/coverage/drop_trait.rs
diff --git a/tests/run-coverage/fn_sig_into_try.coverage → tests/coverage/fn_sig_into_try.coverage b/tests/run-coverage/fn_sig_into_try.coverage → tests/coverage/fn_sig_into_try.coverage
diff --git a/tests/run-coverage/fn_sig_into_try.rs → tests/coverage/fn_sig_into_try.rs b/tests/run-coverage/fn_sig_into_try.rs → tests/coverage/fn_sig_into_try.rs
diff --git a/tests/run-coverage/generics.coverage → tests/coverage/generics.coverage b/tests/run-coverage/generics.coverage → tests/coverage/generics.coverage
diff --git a/tests/run-coverage/generics.rs → tests/coverage/generics.rs b/tests/run-coverage/generics.rs → tests/coverage/generics.rs
diff --git a/tests/run-coverage/if.coverage → tests/coverage/if.coverage b/tests/run-coverage/if.coverage → tests/coverage/if.coverage
diff --git a/tests/run-coverage/if.rs → tests/coverage/if.rs b/tests/run-coverage/if.rs → tests/coverage/if.rs
diff --git a/tests/run-coverage/if_else.coverage → tests/coverage/if_else.coverage b/tests/run-coverage/if_else.coverage → tests/coverage/if_else.coverage
diff --git a/tests/run-coverage/if_else.rs → tests/coverage/if_else.rs b/tests/run-coverage/if_else.rs → tests/coverage/if_else.rs
diff --git a/tests/run-coverage/inline-dead.coverage → tests/coverage/inline-dead.coverage b/tests/run-coverage/inline-dead.coverage → tests/coverage/inline-dead.coverage
diff --git a/tests/run-coverage/inline-dead.rs → tests/coverage/inline-dead.rs b/tests/run-coverage/inline-dead.rs → tests/coverage/inline-dead.rs
diff --git a/tests/run-coverage/inline.coverage → tests/coverage/inline.coverage b/tests/run-coverage/inline.coverage → tests/coverage/inline.coverage
diff --git a/tests/run-coverage/inline.rs → tests/coverage/inline.rs b/tests/run-coverage/inline.rs → tests/coverage/inline.rs
diff --git a/tests/run-coverage/inner_items.coverage → tests/coverage/inner_items.coverage b/tests/run-coverage/inner_items.coverage → tests/coverage/inner_items.coverage
diff --git a/tests/run-coverage/inner_items.rs → tests/coverage/inner_items.rs b/tests/run-coverage/inner_items.rs → tests/coverage/inner_items.rs
diff --git a/tests/run-coverage/issue-83601.coverage → tests/coverage/issue-83601.coverage b/tests/run-coverage/issue-83601.coverage → tests/coverage/issue-83601.coverage
diff --git a/tests/run-coverage/issue-83601.rs → tests/coverage/issue-83601.rs b/tests/run-coverage/issue-83601.rs → tests/coverage/issue-83601.rs
diff --git a/tests/run-coverage/issue-84561.coverage → tests/coverage/issue-84561.coverage b/tests/run-coverage/issue-84561.coverage → tests/coverage/issue-84561.coverage
diff --git a/tests/run-coverage/issue-84561.rs → tests/coverage/issue-84561.rs b/tests/run-coverage/issue-84561.rs → tests/coverage/issue-84561.rs
diff --git a/tests/run-coverage/issue-85461.coverage → tests/coverage/issue-85461.coverage b/tests/run-coverage/issue-85461.coverage → tests/coverage/issue-85461.coverage
diff --git a/tests/run-coverage/issue-85461.rs → tests/coverage/issue-85461.rs b/tests/run-coverage/issue-85461.rs → tests/coverage/issue-85461.rs
diff --git a/tests/run-coverage/issue-93054.coverage → tests/coverage/issue-93054.coverage b/tests/run-coverage/issue-93054.coverage → tests/coverage/issue-93054.coverage
diff --git a/tests/run-coverage/issue-93054.rs → tests/coverage/issue-93054.rs b/tests/run-coverage/issue-93054.rs → tests/coverage/issue-93054.rs
diff --git a/tests/run-coverage/lazy_boolean.coverage → tests/coverage/lazy_boolean.coverage b/tests/run-coverage/lazy_boolean.coverage → tests/coverage/lazy_boolean.coverage
diff --git a/tests/run-coverage/lazy_boolean.rs → tests/coverage/lazy_boolean.rs b/tests/run-coverage/lazy_boolean.rs → tests/coverage/lazy_boolean.rs
diff --git a/tests/run-coverage/long_and_wide.coverage → tests/coverage/long_and_wide.coverage b/tests/run-coverage/long_and_wide.coverage → tests/coverage/long_and_wide.coverage
diff --git a/tests/run-coverage/long_and_wide.rs → tests/coverage/long_and_wide.rs b/tests/run-coverage/long_and_wide.rs → tests/coverage/long_and_wide.rs
diff --git a/tests/run-coverage/loop_break_value.coverage → tests/coverage/loop_break_value.coverage b/tests/run-coverage/loop_break_value.coverage → tests/coverage/loop_break_value.coverage
diff --git a/tests/run-coverage/loop_break_value.rs → tests/coverage/loop_break_value.rs b/tests/run-coverage/loop_break_value.rs → tests/coverage/loop_break_value.rs
diff --git a/tests/run-coverage/loops_branches.coverage → tests/coverage/loops_branches.coverage b/tests/run-coverage/loops_branches.coverage → tests/coverage/loops_branches.coverage
diff --git a/tests/run-coverage/loops_branches.rs → tests/coverage/loops_branches.rs b/tests/run-coverage/loops_branches.rs → tests/coverage/loops_branches.rs
diff --git a/tests/run-coverage/match_or_pattern.coverage → tests/coverage/match_or_pattern.coverage b/tests/run-coverage/match_or_pattern.coverage → tests/coverage/match_or_pattern.coverage
diff --git a/tests/run-coverage/match_or_pattern.rs → tests/coverage/match_or_pattern.rs b/tests/run-coverage/match_or_pattern.rs → tests/coverage/match_or_pattern.rs
diff --git a/tests/run-coverage/nested_loops.coverage → tests/coverage/nested_loops.coverage b/tests/run-coverage/nested_loops.coverage → tests/coverage/nested_loops.coverage
diff --git a/tests/run-coverage/nested_loops.rs → tests/coverage/nested_loops.rs b/tests/run-coverage/nested_loops.rs → tests/coverage/nested_loops.rs
diff --git a/tests/run-coverage/no_cov_crate.coverage → tests/coverage/no_cov_crate.coverage b/tests/run-coverage/no_cov_crate.coverage → tests/coverage/no_cov_crate.coverage
diff --git a/tests/run-coverage/no_cov_crate.rs → tests/coverage/no_cov_crate.rs b/tests/run-coverage/no_cov_crate.rs → tests/coverage/no_cov_crate.rs
diff --git a/tests/run-coverage/overflow.coverage → tests/coverage/overflow.coverage b/tests/run-coverage/overflow.coverage → tests/coverage/overflow.coverage
diff --git a/tests/run-coverage/overflow.rs → tests/coverage/overflow.rs b/tests/run-coverage/overflow.rs → tests/coverage/overflow.rs
diff --git a/tests/run-coverage/panic_unwind.coverage → tests/coverage/panic_unwind.coverage b/tests/run-coverage/panic_unwind.coverage → tests/coverage/panic_unwind.coverage
diff --git a/tests/run-coverage/panic_unwind.rs → tests/coverage/panic_unwind.rs b/tests/run-coverage/panic_unwind.rs → tests/coverage/panic_unwind.rs
diff --git a/tests/run-coverage/partial_eq.coverage → tests/coverage/partial_eq.coverage b/tests/run-coverage/partial_eq.coverage → tests/coverage/partial_eq.coverage
diff --git a/tests/run-coverage/partial_eq.rs → tests/coverage/partial_eq.rs b/tests/run-coverage/partial_eq.rs → tests/coverage/partial_eq.rs
diff --git a/tests/run-coverage/simple_loop.coverage → tests/coverage/simple_loop.coverage b/tests/run-coverage/simple_loop.coverage → tests/coverage/simple_loop.coverage
diff --git a/tests/run-coverage/simple_loop.rs → tests/coverage/simple_loop.rs b/tests/run-coverage/simple_loop.rs → tests/coverage/simple_loop.rs
diff --git a/tests/run-coverage/simple_match.coverage → tests/coverage/simple_match.coverage b/tests/run-coverage/simple_match.coverage → tests/coverage/simple_match.coverage
diff --git a/tests/run-coverage/simple_match.rs → tests/coverage/simple_match.rs b/tests/run-coverage/simple_match.rs → tests/coverage/simple_match.rs
diff --git a/tests/run-coverage/sort_groups.coverage → tests/coverage/sort_groups.coverage b/tests/run-coverage/sort_groups.coverage → tests/coverage/sort_groups.coverage
diff --git a/tests/run-coverage/sort_groups.rs → tests/coverage/sort_groups.rs b/tests/run-coverage/sort_groups.rs → tests/coverage/sort_groups.rs
diff --git a/tests/run-coverage/test_harness.coverage → tests/coverage/test_harness.coverage b/tests/run-coverage/test_harness.coverage → tests/coverage/test_harness.coverage
diff --git a/tests/run-coverage/test_harness.rs → tests/coverage/test_harness.rs b/tests/run-coverage/test_harness.rs → tests/coverage/test_harness.rs
diff --git a/tests/run-coverage/tight_inf_loop.coverage → tests/coverage/tight_inf_loop.coverage b/tests/run-coverage/tight_inf_loop.coverage → tests/coverage/tight_inf_loop.coverage
diff --git a/tests/run-coverage/tight_inf_loop.rs → tests/coverage/tight_inf_loop.rs b/tests/run-coverage/tight_inf_loop.rs → tests/coverage/tight_inf_loop.rs
diff --git a/tests/run-coverage/trivial.coverage → tests/coverage/trivial.coverage b/tests/run-coverage/trivial.coverage → tests/coverage/trivial.coverage
diff --git a/tests/run-coverage/trivial.rs → tests/coverage/trivial.rs b/tests/run-coverage/trivial.rs → tests/coverage/trivial.rs
diff --git a/tests/run-coverage/try_error_result.coverage → tests/coverage/try_error_result.coverage b/tests/run-coverage/try_error_result.coverage → tests/coverage/try_error_result.coverage
diff --git a/tests/run-coverage/try_error_result.rs → tests/coverage/try_error_result.rs b/tests/run-coverage/try_error_result.rs → tests/coverage/try_error_result.rs
diff --git a/tests/run-coverage/unreachable.coverage → tests/coverage/unreachable.coverage b/tests/run-coverage/unreachable.coverage → tests/coverage/unreachable.coverage
diff --git a/tests/run-coverage/unreachable.rs → tests/coverage/unreachable.rs b/tests/run-coverage/unreachable.rs → tests/coverage/unreachable.rs
diff --git a/tests/run-coverage/unused.coverage → tests/coverage/unused.coverage b/tests/run-coverage/unused.coverage → tests/coverage/unused.coverage
diff --git a/tests/run-coverage/unused.rs → tests/coverage/unused.rs b/tests/run-coverage/unused.rs → tests/coverage/unused.rs
diff --git a/tests/run-coverage/unused_mod.coverage → tests/coverage/unused_mod.coverage b/tests/run-coverage/unused_mod.coverage → tests/coverage/unused_mod.coverage
diff --git a/tests/run-coverage/unused_mod.rs → tests/coverage/unused_mod.rs b/tests/run-coverage/unused_mod.rs → tests/coverage/unused_mod.rs
diff --git a/tests/run-coverage/uses_crate.coverage → tests/coverage/uses_crate.coverage b/tests/run-coverage/uses_crate.coverage → tests/coverage/uses_crate.coverage
diff --git a/tests/run-coverage/uses_crate.rs → tests/coverage/uses_crate.rs b/tests/run-coverage/uses_crate.rs → tests/coverage/uses_crate.rs
diff --git a/...s/run-coverage/uses_inline_crate.coverage → tests/coverage/uses_inline_crate.coverage b/...s/run-coverage/uses_inline_crate.coverage → tests/coverage/uses_inline_crate.coverage
diff --git a/tests/run-coverage/uses_inline_crate.rs → tests/coverage/uses_inline_crate.rs b/tests/run-coverage/uses_inline_crate.rs → tests/coverage/uses_inline_crate.rs
diff --git a/tests/run-coverage/while.coverage → tests/coverage/while.coverage b/tests/run-coverage/while.coverage → tests/coverage/while.coverage
diff --git a/tests/run-coverage/while.rs → tests/coverage/while.rs b/tests/run-coverage/while.rs → tests/coverage/while.rs
diff --git a/tests/run-coverage/while_early_ret.coverage → tests/coverage/while_early_ret.coverage b/tests/run-coverage/while_early_ret.coverage → tests/coverage/while_early_ret.coverage
diff --git a/tests/run-coverage/while_early_ret.rs → tests/coverage/while_early_ret.rs b/tests/run-coverage/while_early_ret.rs → tests/coverage/while_early_ret.rs
diff --git a/tests/run-coverage/yield.coverage → tests/coverage/yield.coverage b/tests/run-coverage/yield.coverage → tests/coverage/yield.coverage
diff --git a/tests/run-coverage/yield.rs → tests/coverage/yield.rs b/tests/run-coverage/yield.rs → tests/coverage/yield.rs