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

Fixes: rust-lang#83830 The first commit was migrated from another PR that failed because CI had errors likely resulting from trying to run the coverage tests in run-make. (See: rust-lang#84797 (comment)) So moving the tests should be done as it's own separate PR. To attempt to resolve those CI errors, this PR also updates bootstrap to add LLVM library link path to run-make. When moving coverage tests from run-make-fulldeps to run-make, some targets failed in CI with an obscure message: failed to execute command: "musl-g++" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m32" "-march=i686" "-Wl,-melf_i386" "-static" "-Wa,-mrelax-relocations=no" "-print-file-name=libstdc++.a" error: No such file or directory (os error 2) The coverage tests include # needs-profiler-support and these are the first run-make tests to require it (as far as I can tell). There is a special case in bootstrap for adding the LLVM library link path, and it applies to run-make-fulldeps. This commit adds it for run-make as well.
richkadel · May 7, 2021 · 3e05c09 · 3e05c09
1 parent ca712bc
commit 3e05c09
Show file tree

Hide file tree

Showing 90 changed files with 10 additions and 10 deletions.
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -1216,7 +1216,7 @@ 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" && !suite.ends_with("fulldeps") {
             let rust_demangler = builder
                 .ensure(tool::RustDemangler { compiler, target, extra_features: Vec::new() })
                 .expect("in-tree tool");

diff --git a/src/test/run-make-fulldeps/coverage/compiletest-ignore-dir b/src/test/run-make-fulldeps/coverage/compiletest-ignore-dir
diff --git a/src/test/run-make-fulldeps/coverage/coverage_tools.mk b/src/test/run-make-fulldeps/coverage/coverage_tools.mk
diff --git a/...un-make-fulldeps/coverage-llvmir/Makefile → src/test/run-make/coverage-llvmir/Makefile b/...un-make-fulldeps/coverage-llvmir/Makefile → src/test/run-make/coverage-llvmir/Makefile
diff --git a/...ps/coverage-llvmir/filecheck.testprog.txt → ...ke/coverage-llvmir/filecheck.testprog.txt b/...ps/coverage-llvmir/filecheck.testprog.txt → ...ke/coverage-llvmir/filecheck.testprog.txt
diff --git a/...make-fulldeps/coverage-llvmir/testprog.rs → ...test/run-make/coverage-llvmir/testprog.rs b/...make-fulldeps/coverage-llvmir/testprog.rs → ...test/run-make/coverage-llvmir/testprog.rs
diff --git a/...n-make-fulldeps/coverage-reports/Makefile → src/test/run-make/coverage-reports/Makefile b/...n-make-fulldeps/coverage-reports/Makefile → src/test/run-make/coverage-reports/Makefile
diff --git a/...-reports/expected_show_coverage.abort.txt → ...-reports/expected_show_coverage.abort.txt b/...-reports/expected_show_coverage.abort.txt → ...-reports/expected_show_coverage.abort.txt
diff --git a/...reports/expected_show_coverage.assert.txt → ...reports/expected_show_coverage.assert.txt b/...reports/expected_show_coverage.assert.txt → ...reports/expected_show_coverage.assert.txt
diff --git a/...-reports/expected_show_coverage.async.txt → ...-reports/expected_show_coverage.async.txt b/...-reports/expected_show_coverage.async.txt → ...-reports/expected_show_coverage.async.txt
diff --git a/...reports/expected_show_coverage.async2.txt → ...reports/expected_show_coverage.async2.txt b/...reports/expected_show_coverage.async2.txt → ...reports/expected_show_coverage.async2.txt
diff --git a/...eports/expected_show_coverage.closure.txt → ...eports/expected_show_coverage.closure.txt b/...eports/expected_show_coverage.closure.txt → ...eports/expected_show_coverage.closure.txt
diff --git a/.../expected_show_coverage.closure_macro.txt → .../expected_show_coverage.closure_macro.txt b/.../expected_show_coverage.closure_macro.txt → .../expected_show_coverage.closure_macro.txt
diff --git a/...ted_show_coverage.closure_macro_async.txt → ...ted_show_coverage.closure_macro_async.txt b/...ted_show_coverage.closure_macro_async.txt → ...ted_show_coverage.closure_macro_async.txt
diff --git a/...rts/expected_show_coverage.conditions.txt → ...rts/expected_show_coverage.conditions.txt b/...rts/expected_show_coverage.conditions.txt → ...rts/expected_show_coverage.conditions.txt
diff --git a/...ports/expected_show_coverage.continue.txt → ...ports/expected_show_coverage.continue.txt b/...ports/expected_show_coverage.continue.txt → ...ports/expected_show_coverage.continue.txt
diff --git a/...orts/expected_show_coverage.dead_code.txt → ...orts/expected_show_coverage.dead_code.txt b/...orts/expected_show_coverage.dead_code.txt → ...orts/expected_show_coverage.dead_code.txt
diff --git a/...eports/expected_show_coverage.doctest.txt → ...eports/expected_show_coverage.doctest.txt b/...eports/expected_show_coverage.doctest.txt → ...eports/expected_show_coverage.doctest.txt
diff --git a/...rts/expected_show_coverage.drop_trait.txt → ...rts/expected_show_coverage.drop_trait.txt b/...rts/expected_show_coverage.drop_trait.txt → ...rts/expected_show_coverage.drop_trait.txt
diff --git a/...ports/expected_show_coverage.generics.txt → ...ports/expected_show_coverage.generics.txt b/...ports/expected_show_coverage.generics.txt → ...ports/expected_show_coverage.generics.txt
diff --git a/...age-reports/expected_show_coverage.if.txt → ...age-reports/expected_show_coverage.if.txt b/...age-reports/expected_show_coverage.if.txt → ...age-reports/expected_show_coverage.if.txt
diff --git a/...eports/expected_show_coverage.if_else.txt → ...eports/expected_show_coverage.if_else.txt b/...eports/expected_show_coverage.if_else.txt → ...eports/expected_show_coverage.if_else.txt
diff --git a/...reports/expected_show_coverage.inline.txt → ...reports/expected_show_coverage.inline.txt b/...reports/expected_show_coverage.inline.txt → ...reports/expected_show_coverage.inline.txt
diff --git a/...ts/expected_show_coverage.inner_items.txt → ...ts/expected_show_coverage.inner_items.txt b/...ts/expected_show_coverage.inner_items.txt → ...ts/expected_show_coverage.inner_items.txt
diff --git a/...ts/expected_show_coverage.issue-83601.txt → ...ts/expected_show_coverage.issue-83601.txt b/...ts/expected_show_coverage.issue-83601.txt → ...ts/expected_show_coverage.issue-83601.txt
diff --git a/...ts/expected_show_coverage.issue-84561.txt → ...ts/expected_show_coverage.issue-84561.txt b/...ts/expected_show_coverage.issue-84561.txt → ...ts/expected_show_coverage.issue-84561.txt
diff --git a/...s/expected_show_coverage.lazy_boolean.txt → ...s/expected_show_coverage.lazy_boolean.txt b/...s/expected_show_coverage.lazy_boolean.txt → ...s/expected_show_coverage.lazy_boolean.txt
diff --git a/...pected_show_coverage.loop_break_value.txt → ...pected_show_coverage.loop_break_value.txt b/...pected_show_coverage.loop_break_value.txt → ...pected_show_coverage.loop_break_value.txt
diff --git a/...expected_show_coverage.loops_branches.txt → ...expected_show_coverage.loops_branches.txt b/...expected_show_coverage.loops_branches.txt → ...expected_show_coverage.loops_branches.txt
diff --git a/...pected_show_coverage.match_or_pattern.txt → ...pected_show_coverage.match_or_pattern.txt b/...pected_show_coverage.match_or_pattern.txt → ...pected_show_coverage.match_or_pattern.txt
diff --git a/...s/expected_show_coverage.nested_loops.txt → ...s/expected_show_coverage.nested_loops.txt b/...s/expected_show_coverage.nested_loops.txt → ...s/expected_show_coverage.nested_loops.txt
diff --git a/...s/expected_show_coverage.no_cov_crate.txt → ...s/expected_show_coverage.no_cov_crate.txt b/...s/expected_show_coverage.no_cov_crate.txt → ...s/expected_show_coverage.no_cov_crate.txt
diff --git a/...ports/expected_show_coverage.overflow.txt → ...ports/expected_show_coverage.overflow.txt b/...ports/expected_show_coverage.overflow.txt → ...ports/expected_show_coverage.overflow.txt
diff --git a/...s/expected_show_coverage.panic_unwind.txt → ...s/expected_show_coverage.panic_unwind.txt b/...s/expected_show_coverage.panic_unwind.txt → ...s/expected_show_coverage.panic_unwind.txt
diff --git a/...rts/expected_show_coverage.partial_eq.txt → ...rts/expected_show_coverage.partial_eq.txt b/...rts/expected_show_coverage.partial_eq.txt → ...rts/expected_show_coverage.partial_eq.txt
diff --git a/...ts/expected_show_coverage.simple_loop.txt → ...ts/expected_show_coverage.simple_loop.txt b/...ts/expected_show_coverage.simple_loop.txt → ...ts/expected_show_coverage.simple_loop.txt
diff --git a/...s/expected_show_coverage.simple_match.txt → ...s/expected_show_coverage.simple_match.txt b/...s/expected_show_coverage.simple_match.txt → ...s/expected_show_coverage.simple_match.txt
diff --git a/...expected_show_coverage.tight_inf_loop.txt → ...expected_show_coverage.tight_inf_loop.txt b/...expected_show_coverage.tight_inf_loop.txt → ...expected_show_coverage.tight_inf_loop.txt
diff --git a/...pected_show_coverage.try_error_result.txt → ...pected_show_coverage.try_error_result.txt b/...pected_show_coverage.try_error_result.txt → ...pected_show_coverage.try_error_result.txt
diff --git a/...reports/expected_show_coverage.unused.txt → ...reports/expected_show_coverage.unused.txt b/...reports/expected_show_coverage.unused.txt → ...reports/expected_show_coverage.unused.txt
diff --git a/...rts/expected_show_coverage.uses_crate.txt → ...rts/expected_show_coverage.uses_crate.txt b/...rts/expected_show_coverage.uses_crate.txt → ...rts/expected_show_coverage.uses_crate.txt
diff --git a/...ected_show_coverage.uses_inline_crate.txt → ...ected_show_coverage.uses_inline_crate.txt b/...ected_show_coverage.uses_inline_crate.txt → ...ected_show_coverage.uses_inline_crate.txt
diff --git a/...-reports/expected_show_coverage.while.txt → ...-reports/expected_show_coverage.while.txt b/...-reports/expected_show_coverage.while.txt → ...-reports/expected_show_coverage.while.txt
diff --git a/...xpected_show_coverage.while_early_ret.txt → ...xpected_show_coverage.while_early_ret.txt b/...xpected_show_coverage.while_early_ret.txt → ...xpected_show_coverage.while_early_ret.txt
diff --git a/...-reports/expected_show_coverage.yield.txt → ...-reports/expected_show_coverage.yield.txt b/...-reports/expected_show_coverage.yield.txt → ...-reports/expected_show_coverage.yield.txt
diff --git a/...ldeps/coverage-reports/normalize_paths.py → ...-make/coverage-reports/normalize_paths.py b/...ldeps/coverage-reports/normalize_paths.py → ...-make/coverage-reports/normalize_paths.py
diff --git a/...eps/coverage/WARNING_KEEP_NAMES_SHORT.txt → ...ake/coverage/WARNING_KEEP_NAMES_SHORT.txt b/...eps/coverage/WARNING_KEEP_NAMES_SHORT.txt → ...ake/coverage/WARNING_KEEP_NAMES_SHORT.txt
diff --git a/src/test/run-make-fulldeps/coverage/abort.rs → src/test/run-make/coverage/abort.rs b/src/test/run-make-fulldeps/coverage/abort.rs → src/test/run-make/coverage/abort.rs
diff --git a/...test/run-make-fulldeps/coverage/assert.rs → src/test/run-make/coverage/assert.rs b/...test/run-make-fulldeps/coverage/assert.rs → src/test/run-make/coverage/assert.rs
diff --git a/src/test/run-make-fulldeps/coverage/async.rs → src/test/run-make/coverage/async.rs b/src/test/run-make-fulldeps/coverage/async.rs → src/test/run-make/coverage/async.rs
diff --git a/...test/run-make-fulldeps/coverage/async2.rs → src/test/run-make/coverage/async2.rs b/...test/run-make-fulldeps/coverage/async2.rs → src/test/run-make/coverage/async2.rs
diff --git a/...est/run-make-fulldeps/coverage/closure.rs → src/test/run-make/coverage/closure.rs b/...est/run-make-fulldeps/coverage/closure.rs → src/test/run-make/coverage/closure.rs
diff --git a/...n-make-fulldeps/coverage/closure_macro.rs → src/test/run-make/coverage/closure_macro.rs b/...n-make-fulldeps/coverage/closure_macro.rs → src/test/run-make/coverage/closure_macro.rs
diff --git a/...-fulldeps/coverage/closure_macro_async.rs → .../run-make/coverage/closure_macro_async.rs b/...-fulldeps/coverage/closure_macro_async.rs → .../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
@@ -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/.../run-make-fulldeps/coverage/conditions.rs → src/test/run-make/coverage/conditions.rs b/.../run-make-fulldeps/coverage/conditions.rs → src/test/run-make/coverage/conditions.rs
diff --git a/...st/run-make-fulldeps/coverage/continue.rs → src/test/run-make/coverage/continue.rs b/...st/run-make-fulldeps/coverage/continue.rs → 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
@@ -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/...t/run-make-fulldeps/coverage/dead_code.rs → src/test/run-make/coverage/dead_code.rs b/...t/run-make-fulldeps/coverage/dead_code.rs → src/test/run-make/coverage/dead_code.rs
diff --git a/...est/run-make-fulldeps/coverage/doctest.rs → src/test/run-make/coverage/doctest.rs b/...est/run-make-fulldeps/coverage/doctest.rs → src/test/run-make/coverage/doctest.rs
diff --git a/.../run-make-fulldeps/coverage/drop_trait.rs → src/test/run-make/coverage/drop_trait.rs b/.../run-make-fulldeps/coverage/drop_trait.rs → src/test/run-make/coverage/drop_trait.rs
diff --git a/...st/run-make-fulldeps/coverage/generics.rs → src/test/run-make/coverage/generics.rs b/...st/run-make-fulldeps/coverage/generics.rs → src/test/run-make/coverage/generics.rs
diff --git a/src/test/run-make-fulldeps/coverage/if.rs → src/test/run-make/coverage/if.rs b/src/test/run-make-fulldeps/coverage/if.rs → src/test/run-make/coverage/if.rs
diff --git a/...est/run-make-fulldeps/coverage/if_else.rs → src/test/run-make/coverage/if_else.rs b/...est/run-make-fulldeps/coverage/if_else.rs → src/test/run-make/coverage/if_else.rs
diff --git a/...test/run-make-fulldeps/coverage/inline.rs → src/test/run-make/coverage/inline.rs b/...test/run-make-fulldeps/coverage/inline.rs → src/test/run-make/coverage/inline.rs
diff --git a/...run-make-fulldeps/coverage/inner_items.rs → src/test/run-make/coverage/inner_items.rs b/...run-make-fulldeps/coverage/inner_items.rs → src/test/run-make/coverage/inner_items.rs
diff --git a/...run-make-fulldeps/coverage/issue-83601.rs → src/test/run-make/coverage/issue-83601.rs b/...run-make-fulldeps/coverage/issue-83601.rs → src/test/run-make/coverage/issue-83601.rs
diff --git a/...run-make-fulldeps/coverage/issue-84561.rs → src/test/run-make/coverage/issue-84561.rs b/...run-make-fulldeps/coverage/issue-84561.rs → src/test/run-make/coverage/issue-84561.rs
diff --git a/...un-make-fulldeps/coverage/lazy_boolean.rs → src/test/run-make/coverage/lazy_boolean.rs b/...un-make-fulldeps/coverage/lazy_boolean.rs → src/test/run-make/coverage/lazy_boolean.rs
diff --git a/...ke-fulldeps/coverage/lib/doctest_crate.rs → ...st/run-make/coverage/lib/doctest_crate.rs b/...ke-fulldeps/coverage/lib/doctest_crate.rs → ...st/run-make/coverage/lib/doctest_crate.rs
diff --git a/...-make-fulldeps/coverage/lib/used_crate.rs → src/test/run-make/coverage/lib/used_crate.rs b/...-make-fulldeps/coverage/lib/used_crate.rs → src/test/run-make/coverage/lib/used_crate.rs
diff --git a/...ulldeps/coverage/lib/used_inline_crate.rs → ...un-make/coverage/lib/used_inline_crate.rs b/...ulldeps/coverage/lib/used_inline_crate.rs → ...un-make/coverage/lib/used_inline_crate.rs
diff --git a/...ake-fulldeps/coverage/loop_break_value.rs → ...est/run-make/coverage/loop_break_value.rs b/...ake-fulldeps/coverage/loop_break_value.rs → ...est/run-make/coverage/loop_break_value.rs
diff --git a/...-make-fulldeps/coverage/loops_branches.rs → src/test/run-make/coverage/loops_branches.rs b/...-make-fulldeps/coverage/loops_branches.rs → src/test/run-make/coverage/loops_branches.rs
diff --git a/...ake-fulldeps/coverage/match_or_pattern.rs → ...est/run-make/coverage/match_or_pattern.rs b/...ake-fulldeps/coverage/match_or_pattern.rs → ...est/run-make/coverage/match_or_pattern.rs
diff --git a/...un-make-fulldeps/coverage/nested_loops.rs → src/test/run-make/coverage/nested_loops.rs b/...un-make-fulldeps/coverage/nested_loops.rs → src/test/run-make/coverage/nested_loops.rs
diff --git a/...un-make-fulldeps/coverage/no_cov_crate.rs → src/test/run-make/coverage/no_cov_crate.rs b/...un-make-fulldeps/coverage/no_cov_crate.rs → src/test/run-make/coverage/no_cov_crate.rs
diff --git a/...st/run-make-fulldeps/coverage/overflow.rs → src/test/run-make/coverage/overflow.rs b/...st/run-make-fulldeps/coverage/overflow.rs → src/test/run-make/coverage/overflow.rs
diff --git a/...un-make-fulldeps/coverage/panic_unwind.rs → src/test/run-make/coverage/panic_unwind.rs b/...un-make-fulldeps/coverage/panic_unwind.rs → src/test/run-make/coverage/panic_unwind.rs
diff --git a/.../run-make-fulldeps/coverage/partial_eq.rs → src/test/run-make/coverage/partial_eq.rs b/.../run-make-fulldeps/coverage/partial_eq.rs → src/test/run-make/coverage/partial_eq.rs
diff --git a/...run-make-fulldeps/coverage/simple_loop.rs → src/test/run-make/coverage/simple_loop.rs b/...run-make-fulldeps/coverage/simple_loop.rs → src/test/run-make/coverage/simple_loop.rs
diff --git a/...un-make-fulldeps/coverage/simple_match.rs → src/test/run-make/coverage/simple_match.rs b/...un-make-fulldeps/coverage/simple_match.rs → src/test/run-make/coverage/simple_match.rs
diff --git a/...-make-fulldeps/coverage/tight_inf_loop.rs → src/test/run-make/coverage/tight_inf_loop.rs b/...-make-fulldeps/coverage/tight_inf_loop.rs → src/test/run-make/coverage/tight_inf_loop.rs
diff --git a/...ake-fulldeps/coverage/try_error_result.rs → ...est/run-make/coverage/try_error_result.rs b/...ake-fulldeps/coverage/try_error_result.rs → ...est/run-make/coverage/try_error_result.rs
diff --git a/...test/run-make-fulldeps/coverage/unused.rs → src/test/run-make/coverage/unused.rs b/...test/run-make-fulldeps/coverage/unused.rs → src/test/run-make/coverage/unused.rs
diff --git a/.../run-make-fulldeps/coverage/uses_crate.rs → src/test/run-make/coverage/uses_crate.rs b/.../run-make-fulldeps/coverage/uses_crate.rs → src/test/run-make/coverage/uses_crate.rs
diff --git a/...ke-fulldeps/coverage/uses_inline_crate.rs → ...st/run-make/coverage/uses_inline_crate.rs b/...ke-fulldeps/coverage/uses_inline_crate.rs → ...st/run-make/coverage/uses_inline_crate.rs
diff --git a/src/test/run-make-fulldeps/coverage/while.rs → src/test/run-make/coverage/while.rs b/src/test/run-make-fulldeps/coverage/while.rs → src/test/run-make/coverage/while.rs
diff --git a/...make-fulldeps/coverage/while_early_ret.rs → ...test/run-make/coverage/while_early_ret.rs b/...make-fulldeps/coverage/while_early_ret.rs → ...test/run-make/coverage/while_early_ret.rs
diff --git a/src/test/run-make-fulldeps/coverage/yield.rs → src/test/run-make/coverage/yield.rs b/src/test/run-make-fulldeps/coverage/yield.rs → src/test/run-make/coverage/yield.rs