Skip to content

Commit 9fa62f2

Browse files
borsbors
committed
Auto merge of #99715 - tmiasko:coverage-run-make, r=Mark-Simulacrum
Move coverage tests from run-make-fulldeps to run-make
2 parents 2f847b8 + 01f4534 commit 9fa62f2

File tree

102 files changed

+17
-13
lines changed

Some content is hidden

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

102 files changed

+17
-13
lines changed

‎src/bootstrap/test.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -1384,9 +1384,13 @@ note: if you're sure you want to do this, please open an issue as to why. In the
13841384
.arg(builder.ensure(tool::JsonDocCk { compiler: json_compiler, target }));
13851385
}
13861386

1387-
if mode == "run-make" && suite.ends_with("fulldeps") {
1387+
if mode == "run-make" {
13881388
let rust_demangler = builder
1389-
.ensure(tool::RustDemangler { compiler, target, extra_features: Vec::new() })
1389+
.ensure(tool::RustDemangler {
1390+
compiler,
1391+
target: compiler.host,
1392+
extra_features: Vec::new(),
1393+
})
13901394
.expect("in-tree tool");
13911395
cmd.arg("--rust-demangler-path").arg(rust_demangler);
13921396
}

‎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.

‎src/test/run-make-fulldeps/coverage-llvmir/Makefile ‎src/test/run-make/coverage-llvmir/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# version during testing, with an additional directive at the top of this file
77
# that sets, for example: `min-llvm-version: 12.0`
88

9-
-include ../coverage/coverage_tools.mk
9+
include ../coverage/coverage_tools.mk
1010

1111
BASEDIR=../coverage-llvmir
1212

‎src/test/run-make-fulldeps/coverage-llvmir/filecheck.testprog.txt ‎src/test/run-make/coverage-llvmir/filecheck.testprog.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-llvmir/testprog.rs ‎src/test/run-make/coverage-llvmir/testprog.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/Makefile ‎src/test/run-make/coverage-reports/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works
1111
# properly. Since we only have GCC on the CI ignore the test for now.
1212

13-
-include ../coverage/coverage_tools.mk
13+
include ../coverage/coverage_tools.mk
1414

1515
BASEDIR=../coverage-reports
1616
SOURCEDIR=../coverage

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.abort.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.abort.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.assert.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.assert.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.async.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.async2.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.async2.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.closure.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.closure_macro.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.closure_macro_async.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.closure_macro_async.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.conditions.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.conditions.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.continue.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.continue.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.dead_code.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.dead_code.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.doctest.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.doctest.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.drop_trait.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.drop_trait.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generator.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.generator.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generics.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.generics.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.if.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.if_else.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.if_else.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline-dead.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.inline-dead.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.inline.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inner_items.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.inner_items.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-83601.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.issue-83601.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-84561.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.issue-84561.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-85461.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.issue-85461.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-93054.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.issue-93054.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.lazy_boolean.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loop_break_value.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.loop_break_value.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.loops_branches.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.loops_branches.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.match_or_pattern.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.match_or_pattern.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.nested_loops.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.nested_loops.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.no_cov_crate.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.no_cov_crate.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.overflow.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.overflow.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.panic_unwind.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.partial_eq.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.partial_eq.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_loop.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.simple_loop.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.simple_match.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.simple_match.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.tight_inf_loop.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.tight_inf_loop.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.try_error_result.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.try_error_result.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.unused.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused_mod.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.unused_mod.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_crate.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.uses_crate.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.uses_inline_crate.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.uses_inline_crate.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.while.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.while_early_ret.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.yield.txt ‎src/test/run-make/coverage-reports/expected_show_coverage.yield.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/normalize_paths.py ‎src/test/run-make/coverage-reports/normalize_paths.py

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/WARNING_KEEP_NAMES_SHORT.txt ‎src/test/run-make/coverage/WARNING_KEEP_NAMES_SHORT.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/abort.rs ‎src/test/run-make/coverage/abort.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/assert.rs ‎src/test/run-make/coverage/assert.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/async.rs ‎src/test/run-make/coverage/async.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/async2.rs ‎src/test/run-make/coverage/async2.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/closure.rs ‎src/test/run-make/coverage/closure.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/closure_macro.rs ‎src/test/run-make/coverage/closure_macro.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/closure_macro_async.rs ‎src/test/run-make/coverage/closure_macro_async.rs

File renamed without changes.

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

+3
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.

‎src/test/run-make-fulldeps/coverage/conditions.rs ‎src/test/run-make/coverage/conditions.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/continue.rs ‎src/test/run-make/coverage/continue.rs

File renamed without changes.

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

+6
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

‎src/test/run-make-fulldeps/coverage/dead_code.rs ‎src/test/run-make/coverage/dead_code.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/doctest.rs ‎src/test/run-make/coverage/doctest.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/drop_trait.rs ‎src/test/run-make/coverage/drop_trait.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/generator.rs ‎src/test/run-make/coverage/generator.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/generics.rs ‎src/test/run-make/coverage/generics.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/if.rs ‎src/test/run-make/coverage/if.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/if_else.rs ‎src/test/run-make/coverage/if_else.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/inline-dead.rs ‎src/test/run-make/coverage/inline-dead.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/inline.rs ‎src/test/run-make/coverage/inline.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/inner_items.rs ‎src/test/run-make/coverage/inner_items.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/issue-83601.rs ‎src/test/run-make/coverage/issue-83601.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/issue-84561.rs ‎src/test/run-make/coverage/issue-84561.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/issue-85461.rs ‎src/test/run-make/coverage/issue-85461.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/issue-93054.rs ‎src/test/run-make/coverage/issue-93054.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/lazy_boolean.rs ‎src/test/run-make/coverage/lazy_boolean.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/lib/doctest_crate.rs ‎src/test/run-make/coverage/lib/doctest_crate.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/lib/inline_always_with_dead_code.rs ‎src/test/run-make/coverage/lib/inline_always_with_dead_code.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/lib/unused_mod_helper.rs ‎src/test/run-make/coverage/lib/unused_mod_helper.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/lib/used_crate.rs ‎src/test/run-make/coverage/lib/used_crate.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/lib/used_inline_crate.rs ‎src/test/run-make/coverage/lib/used_inline_crate.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/loop_break_value.rs ‎src/test/run-make/coverage/loop_break_value.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/loops_branches.rs ‎src/test/run-make/coverage/loops_branches.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/match_or_pattern.rs ‎src/test/run-make/coverage/match_or_pattern.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/nested_loops.rs ‎src/test/run-make/coverage/nested_loops.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/no_cov_crate.rs ‎src/test/run-make/coverage/no_cov_crate.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/overflow.rs ‎src/test/run-make/coverage/overflow.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/panic_unwind.rs ‎src/test/run-make/coverage/panic_unwind.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/partial_eq.rs ‎src/test/run-make/coverage/partial_eq.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/simple_loop.rs ‎src/test/run-make/coverage/simple_loop.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/simple_match.rs ‎src/test/run-make/coverage/simple_match.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/tight_inf_loop.rs ‎src/test/run-make/coverage/tight_inf_loop.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/try_error_result.rs ‎src/test/run-make/coverage/try_error_result.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/unused.rs ‎src/test/run-make/coverage/unused.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/unused_mod.rs ‎src/test/run-make/coverage/unused_mod.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/uses_crate.rs ‎src/test/run-make/coverage/uses_crate.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/uses_inline_crate.rs ‎src/test/run-make/coverage/uses_inline_crate.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/while.rs ‎src/test/run-make/coverage/while.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/while_early_ret.rs ‎src/test/run-make/coverage/while_early_ret.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/yield.rs ‎src/test/run-make/coverage/yield.rs

File renamed without changes.

0 commit comments

Comments
 (0)