diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index fd583da908255..5c8034d53e3ad 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1384,9 +1384,13 @@ 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" { let rust_demangler = builder - .ensure(tool::RustDemangler { compiler, target, extra_features: Vec::new() }) + .ensure(tool::RustDemangler { + compiler, + target: compiler.host, + extra_features: Vec::new(), + }) .expect("in-tree tool"); cmd.arg("--rust-demangler-path").arg(rust_demangler); } 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 98% rename from src/test/run-make-fulldeps/coverage-llvmir/Makefile rename to src/test/run-make/coverage-llvmir/Makefile index fbe0a5cb1bb8c..7be6550533224 100644 --- a/src/test/run-make-fulldeps/coverage-llvmir/Makefile +++ b/src/test/run-make/coverage-llvmir/Makefile @@ -6,7 +6,7 @@ # version during testing, with an additional directive at the top of this file # that sets, for example: `min-llvm-version: 12.0` --include ../coverage/coverage_tools.mk +include ../coverage/coverage_tools.mk BASEDIR=../coverage-llvmir 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 99% rename from src/test/run-make-fulldeps/coverage-reports/Makefile rename to src/test/run-make/coverage-reports/Makefile index 78723e78e772f..4e75672f27533 100644 --- a/src/test/run-make-fulldeps/coverage-reports/Makefile +++ b/src/test/run-make/coverage-reports/Makefile @@ -10,7 +10,7 @@ # FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works # properly. Since we only have GCC on the CI ignore the test for now. --include ../coverage/coverage_tools.mk +include ../coverage/coverage_tools.mk BASEDIR=../coverage-reports SOURCEDIR=../coverage 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.generator.txt b/src/test/run-make/coverage-reports/expected_show_coverage.generator.txt similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.generator.txt rename to src/test/run-make/coverage-reports/expected_show_coverage.generator.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-dead.txt b/src/test/run-make/coverage-reports/expected_show_coverage.inline-dead.txt similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.inline-dead.txt rename to src/test/run-make/coverage-reports/expected_show_coverage.inline-dead.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.issue-85461.txt b/src/test/run-make/coverage-reports/expected_show_coverage.issue-85461.txt similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-85461.txt rename to src/test/run-make/coverage-reports/expected_show_coverage.issue-85461.txt diff --git a/src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-93054.txt b/src/test/run-make/coverage-reports/expected_show_coverage.issue-93054.txt similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.issue-93054.txt rename to src/test/run-make/coverage-reports/expected_show_coverage.issue-93054.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.unused_mod.txt b/src/test/run-make/coverage-reports/expected_show_coverage.unused_mod.txt similarity index 100% rename from src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.unused_mod.txt rename to src/test/run-make/coverage-reports/expected_show_coverage.unused_mod.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..0b6bbc33167c1 --- /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/generator.rs b/src/test/run-make/coverage/generator.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/generator.rs rename to src/test/run-make/coverage/generator.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-dead.rs b/src/test/run-make/coverage/inline-dead.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/inline-dead.rs rename to src/test/run-make/coverage/inline-dead.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/issue-85461.rs b/src/test/run-make/coverage/issue-85461.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/issue-85461.rs rename to src/test/run-make/coverage/issue-85461.rs diff --git a/src/test/run-make-fulldeps/coverage/issue-93054.rs b/src/test/run-make/coverage/issue-93054.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/issue-93054.rs rename to src/test/run-make/coverage/issue-93054.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/inline_always_with_dead_code.rs b/src/test/run-make/coverage/lib/inline_always_with_dead_code.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/lib/inline_always_with_dead_code.rs rename to src/test/run-make/coverage/lib/inline_always_with_dead_code.rs diff --git a/src/test/run-make-fulldeps/coverage/lib/unused_mod_helper.rs b/src/test/run-make/coverage/lib/unused_mod_helper.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/lib/unused_mod_helper.rs rename to src/test/run-make/coverage/lib/unused_mod_helper.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/unused_mod.rs b/src/test/run-make/coverage/unused_mod.rs similarity index 100% rename from src/test/run-make-fulldeps/coverage/unused_mod.rs rename to src/test/run-make/coverage/unused_mod.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