From 3e05c0979c9b31c295dcd263a04b6c3ed02e68d3 Mon Sep 17 00:00:00 2001 From: Rich Kadel Date: Fri, 7 May 2021 13:31:09 -0700 Subject: [PATCH 1/2] Move coverage tests from run-make-fulldeps to run-make Fixes: #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: #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. --- src/bootstrap/test.rs | 2 +- src/test/run-make-fulldeps/coverage/compiletest-ignore-dir | 3 --- src/test/run-make-fulldeps/coverage/coverage_tools.mk | 6 ------ .../coverage-llvmir/Makefile | 0 .../coverage-llvmir/filecheck.testprog.txt | 0 .../coverage-llvmir/testprog.rs | 0 .../coverage-reports/Makefile | 0 .../coverage-reports/expected_show_coverage.abort.txt | 0 .../coverage-reports/expected_show_coverage.assert.txt | 0 .../coverage-reports/expected_show_coverage.async.txt | 0 .../coverage-reports/expected_show_coverage.async2.txt | 0 .../coverage-reports/expected_show_coverage.closure.txt | 0 .../expected_show_coverage.closure_macro.txt | 0 .../expected_show_coverage.closure_macro_async.txt | 0 .../coverage-reports/expected_show_coverage.conditions.txt | 0 .../coverage-reports/expected_show_coverage.continue.txt | 0 .../coverage-reports/expected_show_coverage.dead_code.txt | 0 .../coverage-reports/expected_show_coverage.doctest.txt | 0 .../coverage-reports/expected_show_coverage.drop_trait.txt | 0 .../coverage-reports/expected_show_coverage.generics.txt | 0 .../coverage-reports/expected_show_coverage.if.txt | 0 .../coverage-reports/expected_show_coverage.if_else.txt | 0 .../coverage-reports/expected_show_coverage.inline.txt | 0 .../coverage-reports/expected_show_coverage.inner_items.txt | 0 .../coverage-reports/expected_show_coverage.issue-83601.txt | 0 .../coverage-reports/expected_show_coverage.issue-84561.txt | 0 .../expected_show_coverage.lazy_boolean.txt | 0 .../expected_show_coverage.loop_break_value.txt | 0 .../expected_show_coverage.loops_branches.txt | 0 .../expected_show_coverage.match_or_pattern.txt | 0 .../expected_show_coverage.nested_loops.txt | 0 .../expected_show_coverage.no_cov_crate.txt | 0 .../coverage-reports/expected_show_coverage.overflow.txt | 0 .../expected_show_coverage.panic_unwind.txt | 0 .../coverage-reports/expected_show_coverage.partial_eq.txt | 0 .../coverage-reports/expected_show_coverage.simple_loop.txt | 0 .../expected_show_coverage.simple_match.txt | 0 .../expected_show_coverage.tight_inf_loop.txt | 0 .../expected_show_coverage.try_error_result.txt | 0 .../coverage-reports/expected_show_coverage.unused.txt | 0 .../coverage-reports/expected_show_coverage.uses_crate.txt | 0 .../expected_show_coverage.uses_inline_crate.txt | 0 .../coverage-reports/expected_show_coverage.while.txt | 0 .../expected_show_coverage.while_early_ret.txt | 0 .../coverage-reports/expected_show_coverage.yield.txt | 0 .../coverage-reports/normalize_paths.py | 0 .../coverage/WARNING_KEEP_NAMES_SHORT.txt | 0 src/test/{run-make-fulldeps => run-make}/coverage/abort.rs | 0 src/test/{run-make-fulldeps => run-make}/coverage/assert.rs | 0 src/test/{run-make-fulldeps => run-make}/coverage/async.rs | 0 src/test/{run-make-fulldeps => run-make}/coverage/async2.rs | 0 .../{run-make-fulldeps => run-make}/coverage/closure.rs | 0 .../coverage/closure_macro.rs | 0 .../coverage/closure_macro_async.rs | 0 src/test/run-make/coverage/compiletest-ignore-dir | 3 +++ .../{run-make-fulldeps => run-make}/coverage/conditions.rs | 0 .../{run-make-fulldeps => run-make}/coverage/continue.rs | 0 src/test/run-make/coverage/coverage_tools.mk | 6 ++++++ .../{run-make-fulldeps => run-make}/coverage/dead_code.rs | 0 .../{run-make-fulldeps => run-make}/coverage/doctest.rs | 0 .../{run-make-fulldeps => run-make}/coverage/drop_trait.rs | 0 .../{run-make-fulldeps => run-make}/coverage/generics.rs | 0 src/test/{run-make-fulldeps => run-make}/coverage/if.rs | 0 .../{run-make-fulldeps => run-make}/coverage/if_else.rs | 0 src/test/{run-make-fulldeps => run-make}/coverage/inline.rs | 0 .../{run-make-fulldeps => run-make}/coverage/inner_items.rs | 0 .../{run-make-fulldeps => run-make}/coverage/issue-83601.rs | 0 .../{run-make-fulldeps => run-make}/coverage/issue-84561.rs | 0 .../coverage/lazy_boolean.rs | 0 .../coverage/lib/doctest_crate.rs | 0 .../coverage/lib/used_crate.rs | 0 .../coverage/lib/used_inline_crate.rs | 0 .../coverage/loop_break_value.rs | 0 .../coverage/loops_branches.rs | 0 .../coverage/match_or_pattern.rs | 0 .../coverage/nested_loops.rs | 0 .../coverage/no_cov_crate.rs | 0 .../{run-make-fulldeps => run-make}/coverage/overflow.rs | 0 .../coverage/panic_unwind.rs | 0 .../{run-make-fulldeps => run-make}/coverage/partial_eq.rs | 0 .../{run-make-fulldeps => run-make}/coverage/simple_loop.rs | 0 .../coverage/simple_match.rs | 0 .../coverage/tight_inf_loop.rs | 0 .../coverage/try_error_result.rs | 0 src/test/{run-make-fulldeps => run-make}/coverage/unused.rs | 0 .../{run-make-fulldeps => run-make}/coverage/uses_crate.rs | 0 .../coverage/uses_inline_crate.rs | 0 src/test/{run-make-fulldeps => run-make}/coverage/while.rs | 0 .../coverage/while_early_ret.rs | 0 src/test/{run-make-fulldeps => run-make}/coverage/yield.rs | 0 90 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 src/test/run-make-fulldeps/coverage/compiletest-ignore-dir delete mode 100644 src/test/run-make-fulldeps/coverage/coverage_tools.mk rename src/test/{run-make-fulldeps => run-make}/coverage-llvmir/Makefile (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-llvmir/filecheck.testprog.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-llvmir/testprog.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/Makefile (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.abort.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.assert.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.async.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.async2.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.closure.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.closure_macro.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.closure_macro_async.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.conditions.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.continue.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.dead_code.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.doctest.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.drop_trait.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.generics.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.if.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.if_else.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.inline.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.inner_items.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.issue-83601.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.issue-84561.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.lazy_boolean.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.loop_break_value.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.loops_branches.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.match_or_pattern.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.nested_loops.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.no_cov_crate.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.overflow.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.panic_unwind.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.partial_eq.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.simple_loop.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.simple_match.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.tight_inf_loop.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.try_error_result.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.unused.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.uses_crate.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.uses_inline_crate.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.while.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.while_early_ret.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/expected_show_coverage.yield.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage-reports/normalize_paths.py (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/WARNING_KEEP_NAMES_SHORT.txt (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/abort.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/assert.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/async.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/async2.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/closure.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/closure_macro.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/closure_macro_async.rs (100%) create mode 100644 src/test/run-make/coverage/compiletest-ignore-dir rename src/test/{run-make-fulldeps => run-make}/coverage/conditions.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/continue.rs (100%) create mode 100644 src/test/run-make/coverage/coverage_tools.mk rename src/test/{run-make-fulldeps => run-make}/coverage/dead_code.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/doctest.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/drop_trait.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/generics.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/if.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/if_else.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/inline.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/inner_items.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/issue-83601.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/issue-84561.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/lazy_boolean.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/lib/doctest_crate.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/lib/used_crate.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/lib/used_inline_crate.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/loop_break_value.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/loops_branches.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/match_or_pattern.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/nested_loops.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/no_cov_crate.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/overflow.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/panic_unwind.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/partial_eq.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/simple_loop.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/simple_match.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/tight_inf_loop.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/try_error_result.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/unused.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/uses_crate.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/uses_inline_crate.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/while.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/while_early_ret.rs (100%) rename src/test/{run-make-fulldeps => run-make}/coverage/yield.rs (100%) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index c98398cf1d251..bf64693e208a6 100644 --- 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 deleted file mode 100644 index d1824d189e382..0000000000000 --- 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 aa1dc7b91ce94..0000000000000 --- 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-llvmir/Makefile rename to src/test/run-make/coverage-llvmir/Makefile diff --git a/src/test/run-make-fulldeps/coverage-llvmir/filecheck.testprog.txt b/src/test/run-make/coverage-llvmir/filecheck.testprog.txt similarity index 100% rename from src/test/run-make-fulldeps/coverage-llvmir/filecheck.testprog.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-llvmir/testprog.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/Makefile rename to src/test/run-make/coverage-reports/Makefile 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.abort.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.assert.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async2.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro_async.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.conditions.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.continue.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.dead_code.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.doctest.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.drop_trait.txt rename to 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.generics.txt b/src/test/run-make/coverage-reports/expected_show_coverage.generics.txt similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generics.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if_else.txt rename to 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.txt b/src/test/run-make/coverage-reports/expected_show_coverage.inline.txt similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inner_items.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-83601.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-84561.txt rename to 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.lazy_boolean.txt b/src/test/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.lazy_boolean.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loop_break_value.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loops_branches.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.match_or_pattern.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.nested_loops.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.no_cov_crate.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.overflow.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.panic_unwind.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.partial_eq.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_loop.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_match.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.tight_inf_loop.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.try_error_result.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused.txt rename to src/test/run-make/coverage-reports/expected_show_coverage.unused.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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_crate.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_inline_crate.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while_early_ret.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.yield.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/normalize_paths.py rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/WARNING_KEEP_NAMES_SHORT.txt rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/abort.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/assert.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/async.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/async2.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/closure.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/closure_macro.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/closure_macro_async.rs rename to 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 0000000000000..b533b272d38cf --- /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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/conditions.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/continue.rs rename to 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 0000000000000..8fce5f1b958fc --- /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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/dead_code.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/doctest.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/drop_trait.rs rename to src/test/run-make/coverage/drop_trait.rs diff --git a/src/test/run-make-fulldeps/coverage/generics.rs b/src/test/run-make/coverage/generics.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/generics.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/if.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/if_else.rs rename to src/test/run-make/coverage/if_else.rs diff --git a/src/test/run-make-fulldeps/coverage/inline.rs b/src/test/run-make/coverage/inline.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/inline.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/inner_items.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/issue-83601.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/issue-84561.rs rename to src/test/run-make/coverage/issue-84561.rs diff --git a/src/test/run-make-fulldeps/coverage/lazy_boolean.rs b/src/test/run-make/coverage/lazy_boolean.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/lazy_boolean.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/lib/doctest_crate.rs rename to src/test/run-make/coverage/lib/doctest_crate.rs diff --git a/src/test/run-make-fulldeps/coverage/lib/used_crate.rs b/src/test/run-make/coverage/lib/used_crate.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/lib/used_crate.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/lib/used_inline_crate.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/loop_break_value.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/loops_branches.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/match_or_pattern.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/nested_loops.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/no_cov_crate.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/overflow.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/panic_unwind.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/partial_eq.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/simple_loop.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/simple_match.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/tight_inf_loop.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/try_error_result.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/unused.rs rename to src/test/run-make/coverage/unused.rs diff --git a/src/test/run-make-fulldeps/coverage/uses_crate.rs b/src/test/run-make/coverage/uses_crate.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/uses_crate.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/uses_inline_crate.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/while.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/while_early_ret.rs rename to 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 similarity index 100% rename from src/test/run-make-fulldeps/coverage/yield.rs rename to src/test/run-make/coverage/yield.rs From 4881fc78c68ad49debec3ccc2c4301ccf62fa051 Mon Sep 17 00:00:00 2001 From: Rich Kadel Date: Thu, 6 May 2021 13:16:52 -0700 Subject: [PATCH 2/2] adding 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. --- src/bootstrap/test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index bf64693e208a6..cf85387245a2d 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1399,7 +1399,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the // requirement, but the `-L` library path is not propagated across // separate compilations. We can add LLVM's library path to the // platform-specific environment variable as a workaround. - if !builder.config.dry_run && suite.ends_with("fulldeps") { + if !builder.config.dry_run && (suite == "ui-fulldeps" || mode == "run-make") { let llvm_libdir = output(Command::new(&llvm_config).arg("--libdir")); add_link_lib_path(vec![llvm_libdir.trim().into()], &mut cmd); }