Skip to content

Commit d9476a3

Browse files
authored
Unrolled build for rust-lang#126155
Rollup merge of rust-lang#126155 - Zalathar:run-make-fulldeps, r=onur-ozkan Remove empty test suite `tests/run-make-fulldeps` After rust-lang#109770, there were only a handful of tests left in the run-make-fulldeps suite. As of rust-lang#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](rust-lang#121876) (or whether rmake even works with fulldeps).
2 parents b3ca6ee + 5223bf4 commit d9476a3

File tree

8 files changed

+15
-31
lines changed

8 files changed

+15
-31
lines changed

src/bootstrap/src/core/build_steps/test.rs

+3-11
Original file line numberDiff line numberDiff line change
@@ -1487,12 +1487,6 @@ impl Step for RunMake {
14871487
}
14881488
}
14891489

1490-
host_test!(RunMakeFullDeps {
1491-
path: "tests/run-make-fulldeps",
1492-
mode: "run-make",
1493-
suite: "run-make-fulldeps"
1494-
});
1495-
14961490
default_test!(Assembly { path: "tests/assembly", mode: "assembly", suite: "assembly" });
14971491

14981492
/// 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
19731967
add_link_lib_path(vec![llvm_libdir.trim().into()], &mut cmd);
19741968
}
19751969

1976-
if !builder.config.dry_run()
1977-
&& (matches!(suite, "run-make" | "run-make-fulldeps") || mode == "coverage-run")
1978-
{
1970+
if !builder.config.dry_run() && matches!(mode, "run-make" | "coverage-run") {
19791971
// The llvm/bin directory contains many useful cross-platform
19801972
// tools. Pass the path to run-make tests so they can use them.
19811973
// (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
19871979
cmd.arg("--llvm-bin-dir").arg(llvm_bin_path);
19881980
}
19891981

1990-
if !builder.config.dry_run() && matches!(suite, "run-make" | "run-make-fulldeps") {
1982+
if !builder.config.dry_run() && mode == "run-make" {
19911983
// If LLD is available, add it to the PATH
19921984
if builder.config.lld_enabled {
19931985
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
20071999

20082000
// Only pass correct values for these flags for the `run-make` suite as it
20092001
// requires that a C++ compiler was configured which isn't always the case.
2010-
if !builder.config.dry_run() && matches!(suite, "run-make" | "run-make-fulldeps") {
2002+
if !builder.config.dry_run() && mode == "run-make" {
20112003
cmd.arg("--cc")
20122004
.arg(builder.cc(target))
20132005
.arg("--cxx")

src/bootstrap/src/core/builder.rs

-2
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ const PATH_REMAP: &[(&str, &[&str])] = &[
332332
"tests/mir-opt",
333333
"tests/pretty",
334334
"tests/run-make",
335-
"tests/run-make-fulldeps",
336335
"tests/run-pass-valgrind",
337336
"tests/rustdoc",
338337
"tests/rustdoc-gui",
@@ -828,7 +827,6 @@ impl<'a> Builder<'a> {
828827
test::RustAnalyzer,
829828
test::ErrorIndex,
830829
test::Distcheck,
831-
test::RunMakeFullDeps,
832830
test::Nomicon,
833831
test::Reference,
834832
test::RustdocBook,

src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ ENV RUST_CONFIGURE_ARGS \
4444
--set target.x86_64-unknown-linux-gnu.cc=clang \
4545
--set target.x86_64-unknown-linux-gnu.cxx=clang++
4646

47+
# This job appears to be checking two separate things:
48+
# - That we can build the compiler with `--enable-debug`
49+
# (without necessarily testing the result).
50+
# - That the tests with `//@ needs-matching-clang` pass, since they
51+
# don't run by default unless RUSTBUILD_FORCE_CLANG_BASED_TESTS is set.
52+
# - FIXME(https://github.com/rust-lang/rust/pull/126155#issuecomment-2156314273):
53+
# Currently we only run the subset of tests with "clang" in their name.
54+
4755
ENV SCRIPT \
4856
python3 ../x.py --stage 2 build && \
49-
python3 ../x.py --stage 2 test tests/run-make-fulldeps --test-args clang
57+
python3 ../x.py --stage 2 test tests/run-make --test-args clang

src/ci/github-actions/jobs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runners:
3737

3838
envs:
3939
env-x86_64-apple-tests: &env-x86_64-apple-tests
40-
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
40+
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc
4141
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
4242
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
4343
MACOSX_DEPLOYMENT_TARGET: 10.12
@@ -294,7 +294,7 @@ auto:
294294

295295
- image: x86_64-apple-2
296296
env:
297-
SCRIPT: ./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps
297+
SCRIPT: ./x.py --stage 2 test tests/ui tests/rustdoc
298298
<<: *env-x86_64-apple-tests
299299
<<: *job-macos-xl
300300

src/doc/rustc/src/platform-support/nto-qnx.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ export exclude_tests='
160160
--exclude src/tools/linkchecker
161161
--exclude tests/ui-fulldeps
162162
--exclude rustc
163-
--exclude rustdoc
164-
--exclude tests/run-make-fulldeps'
163+
--exclude rustdoc'
165164

166165
env $build_env \
167166
./x.py test \

tests/run-make-fulldeps/README.md

-4
This file was deleted.

tests/ui/feature-gates/feature-gate-extern_prelude.rs

-1
This file was deleted.

tests/ui/feature-gates/feature-gate-extern_prelude.stderr

-8
This file was deleted.

0 commit comments

Comments
 (0)