Skip to content

Commit 3fca198

Browse files
richkadelrichkadel
committed
Move coverage tests from run-make-fulldeps to run-make
Fixes: rust-lang#83830
1 parent 0b0d293 commit 3fca198

File tree

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

92 files changed

+10
-10
lines changed

‎src/bootstrap/test.rs

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

1200-
if mode == "run-make" && suite.ends_with("fulldeps") {
1200+
if mode == "run-make" && !suite.ends_with("fulldeps") {
12011201
let rust_demangler = builder
12021202
.ensure(tool::RustDemangler { compiler, target, extra_features: Vec::new() })
12031203
.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.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.abort.txt renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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.generics.txt renamed to ‎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 renamed to ‎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 renamed to ‎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.txt renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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.lazy_boolean.txt renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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.no_cov_func.txt renamed to ‎src/test/run-make/coverage-reports/expected_show_coverage.no_cov_func.txt

File renamed without changes.

‎src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.overflow.txt renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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.uses_crate.txt renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎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 renamed to ‎src/test/run-make/coverage-reports/normalize_paths.py

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/closure_macro_async.rs renamed to ‎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 renamed to ‎src/test/run-make/coverage/conditions.rs

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/continue.rs renamed to ‎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 renamed to ‎src/test/run-make/coverage/dead_code.rs

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎src/test/run-make-fulldeps/coverage/no_cov_func.rs renamed to ‎src/test/run-make/coverage/no_cov_func.rs

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

0 commit comments

Comments
 (0)