Skip to content

Commit c0aef6d

Browse files
committed
Remove vestigial CI job msvc-aux.
1 parent 7c78a5f commit c0aef6d

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
@@ -434,11 +434,6 @@ jobs:
434434
NO_DEBUG_ASSERTIONS: 1
435435
NO_LLVM_ASSERTIONS: 1
436436
os: windows-latest-xl
437-
- name: x86_64-msvc-aux
438-
env:
439-
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
440-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc"
441-
os: windows-latest-xl
442437
- name: x86_64-msvc-cargo
443438
env:
444439
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo

src/bootstrap/builder.rs

-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ impl<'a> Builder<'a> {
371371
test::UiFullDeps,
372372
test::Rustdoc,
373373
test::Pretty,
374-
test::RunPassValgrindPretty,
375374
test::Crate,
376375
test::CrateLibrustc,
377376
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
@@ -929,13 +929,6 @@ host_test!(UiFullDeps { path: "src/test/ui-fulldeps", mode: "ui", suite: "ui-ful
929929
host_test!(Rustdoc { path: "src/test/rustdoc", mode: "rustdoc", suite: "rustdoc" });
930930

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

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

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
@@ -496,12 +496,6 @@ jobs:
496496
NO_LLVM_ASSERTIONS: 1
497497
<<: *job-windows-xl
498498

499-
- name: x86_64-msvc-aux
500-
env:
501-
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
502-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
503-
<<: *job-windows-xl
504-
505499
- name: x86_64-msvc-cargo
506500
env:
507501
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo

0 commit comments

Comments
 (0)