Rollup merge of #126155 - Zalathar:run-make-fulldeps, r=onur-ozkan
Remove empty test suite `tests/run-make-fulldeps` After #109770, there were only a handful of tests left in the run-make-fulldeps suite. As of #126111, there are no longer *any* run-make-fulldeps tests, so now we can: - Remove the directory - Remove related bootstrap/compiletest code - Remove various other references in CI scripts and documentation. By removing this suite, we also no longer need to worry about discrepancies between it and ui-fulldeps, and we don't have to worry about porting tests from Makefile to [rmake](https://github.com/rust-lang/rust/issues/121876) (or whether rmake even works with fulldeps).
This commit is contained in:
commit
246fc285de
8 changed files with 15 additions and 31 deletions
|
@ -1487,12 +1487,6 @@ impl Step for RunMake {
|
|||
}
|
||||
}
|
||||
|
||||
host_test!(RunMakeFullDeps {
|
||||
path: "tests/run-make-fulldeps",
|
||||
mode: "run-make",
|
||||
suite: "run-make-fulldeps"
|
||||
});
|
||||
|
||||
default_test!(Assembly { path: "tests/assembly", mode: "assembly", suite: "assembly" });
|
||||
|
||||
/// Coverage tests are a bit more complicated than other test suites, because
|
||||
|
@ -1973,9 +1967,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
|
|||
add_link_lib_path(vec![llvm_libdir.trim().into()], &mut cmd);
|
||||
}
|
||||
|
||||
if !builder.config.dry_run()
|
||||
&& (matches!(suite, "run-make" | "run-make-fulldeps") || mode == "coverage-run")
|
||||
{
|
||||
if !builder.config.dry_run() && matches!(mode, "run-make" | "coverage-run") {
|
||||
// The llvm/bin directory contains many useful cross-platform
|
||||
// tools. Pass the path to run-make tests so they can use them.
|
||||
// (The coverage-run tests also need these tools to process
|
||||
|
@ -1987,7 +1979,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
|
|||
cmd.arg("--llvm-bin-dir").arg(llvm_bin_path);
|
||||
}
|
||||
|
||||
if !builder.config.dry_run() && matches!(suite, "run-make" | "run-make-fulldeps") {
|
||||
if !builder.config.dry_run() && mode == "run-make" {
|
||||
// If LLD is available, add it to the PATH
|
||||
if builder.config.lld_enabled {
|
||||
let lld_install_root =
|
||||
|
@ -2007,7 +1999,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
|
|||
|
||||
// Only pass correct values for these flags for the `run-make` suite as it
|
||||
// requires that a C++ compiler was configured which isn't always the case.
|
||||
if !builder.config.dry_run() && matches!(suite, "run-make" | "run-make-fulldeps") {
|
||||
if !builder.config.dry_run() && mode == "run-make" {
|
||||
cmd.arg("--cc")
|
||||
.arg(builder.cc(target))
|
||||
.arg("--cxx")
|
||||
|
|
|
@ -332,7 +332,6 @@ const PATH_REMAP: &[(&str, &[&str])] = &[
|
|||
"tests/mir-opt",
|
||||
"tests/pretty",
|
||||
"tests/run-make",
|
||||
"tests/run-make-fulldeps",
|
||||
"tests/run-pass-valgrind",
|
||||
"tests/rustdoc",
|
||||
"tests/rustdoc-gui",
|
||||
|
@ -828,7 +827,6 @@ impl<'a> Builder<'a> {
|
|||
test::RustAnalyzer,
|
||||
test::ErrorIndex,
|
||||
test::Distcheck,
|
||||
test::RunMakeFullDeps,
|
||||
test::Nomicon,
|
||||
test::Reference,
|
||||
test::RustdocBook,
|
||||
|
|
|
@ -44,6 +44,14 @@ ENV RUST_CONFIGURE_ARGS \
|
|||
--set target.x86_64-unknown-linux-gnu.cc=clang \
|
||||
--set target.x86_64-unknown-linux-gnu.cxx=clang++
|
||||
|
||||
# This job appears to be checking two separate things:
|
||||
# - That we can build the compiler with `--enable-debug`
|
||||
# (without necessarily testing the result).
|
||||
# - That the tests with `//@ needs-matching-clang` pass, since they
|
||||
# don't run by default unless RUSTBUILD_FORCE_CLANG_BASED_TESTS is set.
|
||||
# - FIXME(https://github.com/rust-lang/rust/pull/126155#issuecomment-2156314273):
|
||||
# Currently we only run the subset of tests with "clang" in their name.
|
||||
|
||||
ENV SCRIPT \
|
||||
python3 ../x.py --stage 2 build && \
|
||||
python3 ../x.py --stage 2 test tests/run-make-fulldeps --test-args clang
|
||||
python3 ../x.py --stage 2 test tests/run-make --test-args clang
|
||||
|
|
|
@ -37,7 +37,7 @@ runners:
|
|||
|
||||
envs:
|
||||
env-x86_64-apple-tests: &env-x86_64-apple-tests
|
||||
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
|
||||
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc
|
||||
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
|
||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||
MACOSX_DEPLOYMENT_TARGET: 10.12
|
||||
|
@ -294,7 +294,7 @@ auto:
|
|||
|
||||
- image: x86_64-apple-2
|
||||
env:
|
||||
SCRIPT: ./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps
|
||||
SCRIPT: ./x.py --stage 2 test tests/ui tests/rustdoc
|
||||
<<: *env-x86_64-apple-tests
|
||||
<<: *job-macos-xl
|
||||
|
||||
|
|
|
@ -160,8 +160,7 @@ export exclude_tests='
|
|||
--exclude src/tools/linkchecker
|
||||
--exclude tests/ui-fulldeps
|
||||
--exclude rustc
|
||||
--exclude rustdoc
|
||||
--exclude tests/run-make-fulldeps'
|
||||
--exclude rustdoc'
|
||||
|
||||
env $build_env \
|
||||
./x.py test \
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
If this directory is empty, Git won't create it, and compiletest will complain
|
||||
that it can't find a nonexistent test suite directory.
|
||||
|
||||
FIXME(#126111): Remove `run-make-fulldeps` from bootstrap.
|
|
@ -1 +0,0 @@
|
|||
can-only-test-this-in-run-make-fulldeps //~ ERROR expected one of `!` or `::`, found `-`
|
|
@ -1,8 +0,0 @@
|
|||
error: expected one of `!` or `::`, found `-`
|
||||
--> $DIR/feature-gate-extern_prelude.rs:1:4
|
||||
|
|
||||
LL | can-only-test-this-in-run-make-fulldeps
|
||||
| ^ expected one of `!` or `::`
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
Loading…
Add table
Reference in a new issue