Skip to content

Commit fb75d4a

Browse files
authored
Rollup merge of #73296 - ehuss:remove-msvc-aux, r=Mark-Simulacrum
Remove vestigial CI job msvc-aux. This CI job isn't really doing anything, so it seems prudent to remove it. For some history: * This was introduced in #48809 when the msvc job was split in two to keep it under 2 hours (oh the good old days). At the time, this check-aux job did a bunch of things: * tidy * src/test/pretty * src/test/run-pass/pretty * src/test/run-fail/pretty * src/test/run-pass-valgrind/pretty * src/test/run-pass-fulldeps/pretty * src/test/run-fail-fulldeps/pretty * Tidy was removed in #60777. * run-pass and run-pass-fulldeps moved to UI in #63029 * src/test/pretty removed in #58140 * src/test/run-fail moved to UI in #71185 * run-fail-fulldeps removed in #51285 Over time through attrition, the job was left with one lonely thing: `src/test/run-pass-valgrind/pretty`. And of course, this wasn't actually running the "pretty" tests. The normal `run-pass-valgrind` tests ran, and then when it tried to run in "pretty" mode, all the tests were ignored because compiletest thought nothing had changed (apparently compiletest isn't fingerprinting the mode? Needs more investigation…). `run-pass-valgrind` is already being run as part of `x86_64-msvc-1`, so there's no need to run it here. I've taken the liberty of removing `src/test/run-pass-valgrind/pretty` as a distinct test. I'm guessing from the other PR's that the pretty tests should now live in `src/test/pretty`, and that the team has moved away from doing pretty tests on other parts of the `src/test` tree.
2 parents ec6fe42 + c0aef6d commit fb75d4a

File tree

6 files changed

+2
-31
lines changed

6 files changed

+2
-31
lines changed

.github/workflows/ci.yml

-5
Original file line numberDiff line numberDiff line change
@@ -428,11 +428,6 @@ jobs:
428428
NO_DEBUG_ASSERTIONS: 1
429429
NO_LLVM_ASSERTIONS: 1
430430
os: windows-latest-xl
431-
- name: x86_64-msvc-aux
432-
env:
433-
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
434-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc"
435-
os: windows-latest-xl
436431
- name: x86_64-msvc-cargo
437432
env:
438433
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo

src/bootstrap/builder.rs

-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ impl<'a> Builder<'a> {
373373
test::UiFullDeps,
374374
test::Rustdoc,
375375
test::Pretty,
376-
test::RunPassValgrindPretty,
377376
test::Crate,
378377
test::CrateLibrustc,
379378
test::CrateRustdoc,

src/bootstrap/mk/Makefile.in

+2-8
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ Q := @
66
BOOTSTRAP_ARGS :=
77
endif
88

9-
ifdef EXCLUDE_CARGO
10-
AUX_ARGS :=
11-
else
12-
AUX_ARGS := src/tools/cargo src/tools/cargotest
13-
endif
14-
159
BOOTSTRAP := $(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap.py
1610

1711
all:
@@ -48,8 +42,8 @@ check:
4842
$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS)
4943
check-aux:
5044
$(Q)$(BOOTSTRAP) test \
51-
src/test/run-pass-valgrind/pretty \
52-
$(AUX_ARGS) \
45+
src/tools/cargo \
46+
src/tools/cargotest \
5347
$(BOOTSTRAP_ARGS)
5448
check-bootstrap:
5549
$(Q)$(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap_test.py

src/bootstrap/test.rs

-7
Original file line numberDiff line numberDiff line change
@@ -930,13 +930,6 @@ host_test!(UiFullDeps { path: "src/test/ui-fulldeps", mode: "ui", suite: "ui-ful
930930
host_test!(Rustdoc { path: "src/test/rustdoc", mode: "rustdoc", suite: "rustdoc" });
931931

932932
host_test!(Pretty { path: "src/test/pretty", mode: "pretty", suite: "pretty" });
933-
test!(RunPassValgrindPretty {
934-
path: "src/test/run-pass-valgrind/pretty",
935-
mode: "pretty",
936-
suite: "run-pass-valgrind",
937-
default: false,
938-
host: true
939-
});
940933

941934
default_test!(RunMake { path: "src/test/run-make", mode: "run-make", suite: "run-make" });
942935

src/ci/azure-pipelines/auto.yml

-4
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,6 @@ jobs:
142142
# FIXME(#59637)
143143
NO_DEBUG_ASSERTIONS: 1
144144
NO_LLVM_ASSERTIONS: 1
145-
# MSVC aux tests
146-
x86_64-msvc-aux:
147-
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
148-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
149145
x86_64-msvc-cargo:
150146
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
151147
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld

src/ci/github-actions/ci.yml

-6
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,6 @@ jobs:
492492
NO_LLVM_ASSERTIONS: 1
493493
<<: *job-windows-xl
494494

495-
- name: x86_64-msvc-aux
496-
env:
497-
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
498-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
499-
<<: *job-windows-xl
500-
501495
- name: x86_64-msvc-cargo
502496
env:
503497
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo

0 commit comments

Comments
 (0)