nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove vestigial CI job msvc-aux.

Browse Source
This commit is contained in:
Eric Huss 2020-06-12 14:17:42 -07:00
parent 7c78a5f97d
commit c0aef6d816
6 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/ci.yml vendored
View File

@ -434,11 +434,6 @@ jobs:
NO_DEBUG_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1
NO_LLVM_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1
os: windows-latest-xl os: windows-latest-xl
- name: x86_64-msvc-aux
env:
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc"
os: windows-latest-xl
- name: x86_64-msvc-cargo - name: x86_64-msvc-cargo
env: env:
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo SCRIPT: python x.py test src/tools/cargotest src/tools/cargo

1
src/bootstrap/builder.rs
View File

@ -371,7 +371,6 @@ impl<'a> Builder<'a> {
test::UiFullDeps, test::UiFullDeps,
test::Rustdoc, test::Rustdoc,
test::Pretty, test::Pretty,
test::RunPassValgrindPretty,
test::Crate, test::Crate,
test::CrateLibrustc, test::CrateLibrustc,
test::CrateRustdoc, test::CrateRustdoc,

10
src/bootstrap/mk/Makefile.in
View File

@ -6,12 +6,6 @@ Q := @
BOOTSTRAP_ARGS := BOOTSTRAP_ARGS :=
endif endif
ifdef EXCLUDE_CARGO
AUX_ARGS :=
else
AUX_ARGS := src/tools/cargo src/tools/cargotest
endif
BOOTSTRAP := $(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap.py BOOTSTRAP := $(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap.py
all: all:
@ -48,8 +42,8 @@ check:
$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS) $(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS)
check-aux: check-aux:
$(Q)$(BOOTSTRAP) test \ $(Q)$(BOOTSTRAP) test \
src/test/run-pass-valgrind/pretty \ src/tools/cargo \
$(AUX_ARGS) \ src/tools/cargotest \
$(BOOTSTRAP_ARGS) $(BOOTSTRAP_ARGS)
check-bootstrap: check-bootstrap:
$(Q)$(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap_test.py $(Q)$(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap_test.py

7
src/bootstrap/test.rs
View File

@ -929,13 +929,6 @@ host_test!(UiFullDeps { path: "src/test/ui-fulldeps", mode: "ui", suite: "ui-ful
host_test!(Rustdoc { path: "src/test/rustdoc", mode: "rustdoc", suite: "rustdoc" }); host_test!(Rustdoc { path: "src/test/rustdoc", mode: "rustdoc", suite: "rustdoc" });
host_test!(Pretty { path: "src/test/pretty", mode: "pretty", suite: "pretty" }); host_test!(Pretty { path: "src/test/pretty", mode: "pretty", suite: "pretty" });
test!(RunPassValgrindPretty {
path: "src/test/run-pass-valgrind/pretty",
mode: "pretty",
suite: "run-pass-valgrind",
default: false,
host: true
});
default_test!(RunMake { path: "src/test/run-make", mode: "run-make", suite: "run-make" }); default_test!(RunMake { path: "src/test/run-make", mode: "run-make", suite: "run-make" });

4
src/ci/azure-pipelines/auto.yml
View File

@ -142,10 +142,6 @@ jobs:
# FIXME(#59637) # FIXME(#59637)
NO_DEBUG_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1
NO_LLVM_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1
# MSVC aux tests
x86_64-msvc-aux:
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
x86_64-msvc-cargo: x86_64-msvc-cargo:
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld

6
src/ci/github-actions/ci.yml
View File

@ -496,12 +496,6 @@ jobs:
NO_LLVM_ASSERTIONS: 1 NO_LLVM_ASSERTIONS: 1
<<: *job-windows-xl <<: *job-windows-xl
- name: x86_64-msvc-aux
env:
RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
<<: *job-windows-xl
- name: x86_64-msvc-cargo - name: x86_64-msvc-cargo
env: env:
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo SCRIPT: python x.py test src/tools/cargotest src/tools/cargo