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

2022-07-25 00:00:00 +00:00 · 2022-07-25 00:00:00 +00:00 · 866d5c621c
commit 866d5c621c
parent 48316dfea1
100 changed files with 4 additions and 4 deletions
--- a/src/test/run-make-fulldeps/coverage/compiletest-ignore-dir
+++ b/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.
--- a/src/test/run-make-fulldeps/coverage-llvmir/Makefile
+++ b/src/test/run-make-fulldeps/coverage-llvmir/Makefile
--- a/src/test/run-make-fulldeps/coverage-llvmir/filecheck.testprog.txt
+++ b/src/test/run-make-fulldeps/coverage-llvmir/filecheck.testprog.txt
--- a/src/test/run-make-fulldeps/coverage-llvmir/testprog.rs
+++ b/src/test/run-make-fulldeps/coverage-llvmir/testprog.rs
--- a/src/test/run-make-fulldeps/coverage-reports/Makefile
+++ b/src/test/run-make-fulldeps/coverage-reports/Makefile
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.abort.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.abort.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.assert.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.assert.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async2.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async2.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro_async.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro_async.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.conditions.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.conditions.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.continue.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.continue.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.dead_code.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.dead_code.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.doctest.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.doctest.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.drop_trait.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.drop_trait.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generator.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generator.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generics.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generics.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if_else.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if_else.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline-dead.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline-dead.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inner_items.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inner_items.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-83601.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-83601.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-84561.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-84561.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-85461.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-85461.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-93054.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-93054.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.lazy_boolean.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.lazy_boolean.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loop_break_value.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loop_break_value.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loops_branches.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loops_branches.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.match_or_pattern.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.match_or_pattern.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.nested_loops.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.nested_loops.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.no_cov_crate.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.no_cov_crate.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.overflow.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.overflow.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.panic_unwind.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.panic_unwind.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.partial_eq.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.partial_eq.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_loop.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_loop.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_match.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_match.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.tight_inf_loop.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.tight_inf_loop.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.try_error_result.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.try_error_result.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused_mod.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused_mod.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_crate.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_crate.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_inline_crate.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_inline_crate.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while_early_ret.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while_early_ret.txt
--- a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.yield.txt
+++ b/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.yield.txt
--- a/src/test/run-make-fulldeps/coverage-reports/normalize_paths.py
+++ b/src/test/run-make-fulldeps/coverage-reports/normalize_paths.py
--- a/src/test/run-make-fulldeps/coverage/WARNING_KEEP_NAMES_SHORT.txt
+++ b/src/test/run-make-fulldeps/coverage/WARNING_KEEP_NAMES_SHORT.txt
--- a/src/test/run-make-fulldeps/coverage/abort.rs
+++ b/src/test/run-make-fulldeps/coverage/abort.rs
--- a/src/test/run-make-fulldeps/coverage/assert.rs
+++ b/src/test/run-make-fulldeps/coverage/assert.rs
--- a/src/test/run-make-fulldeps/coverage/async.rs
+++ b/src/test/run-make-fulldeps/coverage/async.rs
--- a/src/test/run-make-fulldeps/coverage/async2.rs
+++ b/src/test/run-make-fulldeps/coverage/async2.rs
--- a/src/test/run-make-fulldeps/coverage/closure.rs
+++ b/src/test/run-make-fulldeps/coverage/closure.rs
--- a/src/test/run-make-fulldeps/coverage/closure_macro.rs
+++ b/src/test/run-make-fulldeps/coverage/closure_macro.rs
--- a/src/test/run-make-fulldeps/coverage/closure_macro_async.rs
+++ b/src/test/run-make-fulldeps/coverage/closure_macro_async.rs
--- a/src/test/run-make/coverage/compiletest-ignore-dir
+++ 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.
--- a/src/test/run-make-fulldeps/coverage/conditions.rs
+++ b/src/test/run-make-fulldeps/coverage/conditions.rs
--- a/src/test/run-make-fulldeps/coverage/continue.rs
+++ b/src/test/run-make-fulldeps/coverage/continue.rs
--- a/src/test/run-make-fulldeps/coverage/coverage_tools.mk
+++ b/src/test/run-make-fulldeps/coverage/coverage_tools.mk
@ -1,4 +1,4 @@
-# Common Makefile include for Rust `run-make-fulldeps/coverage-* tests. Include this
+# Common Makefile include for Rust `run-make/coverage-* tests. Include this
 # file with the line:
 #
 # -include ../coverage/coverage_tools.mk
--- a/src/test/run-make-fulldeps/coverage/dead_code.rs
+++ b/src/test/run-make-fulldeps/coverage/dead_code.rs
--- a/src/test/run-make-fulldeps/coverage/doctest.rs
+++ b/src/test/run-make-fulldeps/coverage/doctest.rs
--- a/src/test/run-make-fulldeps/coverage/drop_trait.rs
+++ b/src/test/run-make-fulldeps/coverage/drop_trait.rs
--- a/src/test/run-make-fulldeps/coverage/generator.rs
+++ b/src/test/run-make-fulldeps/coverage/generator.rs
--- a/src/test/run-make-fulldeps/coverage/generics.rs
+++ b/src/test/run-make-fulldeps/coverage/generics.rs
--- a/src/test/run-make-fulldeps/coverage/if.rs
+++ b/src/test/run-make-fulldeps/coverage/if.rs
--- a/src/test/run-make-fulldeps/coverage/if_else.rs
+++ b/src/test/run-make-fulldeps/coverage/if_else.rs
--- a/src/test/run-make-fulldeps/coverage/inline-dead.rs
+++ b/src/test/run-make-fulldeps/coverage/inline-dead.rs
--- a/src/test/run-make-fulldeps/coverage/inline.rs
+++ b/src/test/run-make-fulldeps/coverage/inline.rs
--- a/src/test/run-make-fulldeps/coverage/inner_items.rs
+++ b/src/test/run-make-fulldeps/coverage/inner_items.rs
--- a/src/test/run-make-fulldeps/coverage/issue-83601.rs
+++ b/src/test/run-make-fulldeps/coverage/issue-83601.rs
--- a/src/test/run-make-fulldeps/coverage/issue-84561.rs
+++ b/src/test/run-make-fulldeps/coverage/issue-84561.rs
--- a/src/test/run-make-fulldeps/coverage/issue-85461.rs
+++ b/src/test/run-make-fulldeps/coverage/issue-85461.rs
--- a/src/test/run-make-fulldeps/coverage/issue-93054.rs
+++ b/src/test/run-make-fulldeps/coverage/issue-93054.rs
--- a/src/test/run-make-fulldeps/coverage/lazy_boolean.rs
+++ b/src/test/run-make-fulldeps/coverage/lazy_boolean.rs
--- a/src/test/run-make-fulldeps/coverage/lib/doctest_crate.rs
+++ b/src/test/run-make-fulldeps/coverage/lib/doctest_crate.rs
--- a/src/test/run-make-fulldeps/coverage/lib/inline_always_with_dead_code.rs
+++ b/src/test/run-make-fulldeps/coverage/lib/inline_always_with_dead_code.rs
--- a/src/test/run-make-fulldeps/coverage/lib/unused_mod_helper.rs
+++ b/src/test/run-make-fulldeps/coverage/lib/unused_mod_helper.rs
--- a/src/test/run-make-fulldeps/coverage/lib/used_crate.rs
+++ b/src/test/run-make-fulldeps/coverage/lib/used_crate.rs
--- a/src/test/run-make-fulldeps/coverage/lib/used_inline_crate.rs
+++ b/src/test/run-make-fulldeps/coverage/lib/used_inline_crate.rs
--- a/src/test/run-make-fulldeps/coverage/loop_break_value.rs
+++ b/src/test/run-make-fulldeps/coverage/loop_break_value.rs
--- a/src/test/run-make-fulldeps/coverage/loops_branches.rs
+++ b/src/test/run-make-fulldeps/coverage/loops_branches.rs
--- a/src/test/run-make-fulldeps/coverage/match_or_pattern.rs
+++ b/src/test/run-make-fulldeps/coverage/match_or_pattern.rs
--- a/src/test/run-make-fulldeps/coverage/nested_loops.rs
+++ b/src/test/run-make-fulldeps/coverage/nested_loops.rs
--- a/src/test/run-make-fulldeps/coverage/no_cov_crate.rs
+++ b/src/test/run-make-fulldeps/coverage/no_cov_crate.rs
--- a/src/test/run-make-fulldeps/coverage/overflow.rs
+++ b/src/test/run-make-fulldeps/coverage/overflow.rs
--- a/src/test/run-make-fulldeps/coverage/panic_unwind.rs
+++ b/src/test/run-make-fulldeps/coverage/panic_unwind.rs
--- a/src/test/run-make-fulldeps/coverage/partial_eq.rs
+++ b/src/test/run-make-fulldeps/coverage/partial_eq.rs
--- a/src/test/run-make-fulldeps/coverage/simple_loop.rs
+++ b/src/test/run-make-fulldeps/coverage/simple_loop.rs
--- a/src/test/run-make-fulldeps/coverage/simple_match.rs
+++ b/src/test/run-make-fulldeps/coverage/simple_match.rs
--- a/src/test/run-make-fulldeps/coverage/tight_inf_loop.rs
+++ b/src/test/run-make-fulldeps/coverage/tight_inf_loop.rs
--- a/src/test/run-make-fulldeps/coverage/try_error_result.rs
+++ b/src/test/run-make-fulldeps/coverage/try_error_result.rs
--- a/src/test/run-make-fulldeps/coverage/unused.rs
+++ b/src/test/run-make-fulldeps/coverage/unused.rs
--- a/src/test/run-make-fulldeps/coverage/unused_mod.rs
+++ b/src/test/run-make-fulldeps/coverage/unused_mod.rs
--- a/src/test/run-make-fulldeps/coverage/uses_crate.rs
+++ b/src/test/run-make-fulldeps/coverage/uses_crate.rs
--- a/src/test/run-make-fulldeps/coverage/uses_inline_crate.rs
+++ b/src/test/run-make-fulldeps/coverage/uses_inline_crate.rs
--- a/src/test/run-make-fulldeps/coverage/while.rs
+++ b/src/test/run-make-fulldeps/coverage/while.rs
--- a/src/test/run-make-fulldeps/coverage/while_early_ret.rs
+++ b/src/test/run-make-fulldeps/coverage/while_early_ret.rs
--- a/src/test/run-make-fulldeps/coverage/yield.rs
+++ b/src/test/run-make-fulldeps/coverage/yield.rs