Skip to content

Commit 3e05c09

Browse files
committed
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.
1 parent ca712bc commit 3e05c09

File tree

90 files changed

+10
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+10
-10
lines changed

src/bootstrap/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the
12161216
.arg(builder.ensure(tool::JsonDocCk { compiler: json_compiler, target }));
12171217
}
12181218

1219-
if mode == "run-make" && suite.ends_with("fulldeps") {
1219+
if mode == "run-make" && !suite.ends_with("fulldeps") {
12201220
let rust_demangler = builder
12211221
.ensure(tool::RustDemangler { compiler, target, extra_features: Vec::new() })
12221222
.expect("in-tree tool");

src/test/run-make-fulldeps/coverage/compiletest-ignore-dir

-3
This file was deleted.

src/test/run-make-fulldeps/coverage/coverage_tools.mk

-6
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Directory "coverage" supports the tests at prefix ../coverage-*
2+
3+
# Use ./x.py [options] test src/test/run-make/coverage to run all related tests.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Common Makefile include for Rust `run-make/coverage-* tests. Include this
2+
# file with the line:
3+
#
4+
# -include ../coverage/coverage_tools.mk
5+
6+
-include ../../run-make-fulldeps/tools.mk

0 commit comments

Comments
 (0)