about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorJakub Beránek <berykubik@gmail.com>2023-06-14 23:07:49 +0200
committerJakub Beránek <berykubik@gmail.com>2023-06-14 23:07:49 +0200
commit895eb3035e2e4e9e726f5fa5523e3f2fa861583a (patch)
tree35d56ffc928975f5218a85340ed8c1d4e93816d1 /src/bootstrap
parent0b475c705f36fb3b0a63994b92f2bbd2f5865b07 (diff)
downloadrust-895eb3035e2e4e9e726f5fa5523e3f2fa861583a.tar.gz
rust-895eb3035e2e4e9e726f5fa5523e3f2fa861583a.zip
Merge `msvc-1/2` CI jobs
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/mk/Makefile.in12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index d54a21b9f16..779db9fffa8 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -57,17 +57,11 @@ tidy:
 prepare:
 	$(Q)$(BOOTSTRAP) build --stage 2 nonexistent/path/to/trigger/cargo/metadata
 
-TESTS_IN_2 := \
-	tests/ui \
-	src/tools/linkchecker
-
 ## MSVC native builders
 
-# these intentionally don't use `$(BOOTSTRAP)` so we can test the shebang on Windows
-ci-subset-1:
-	$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 $(TESTS_IN_2:%=--exclude %)
-ci-subset-2:
-	$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 $(TESTS_IN_2)
+# this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows
+ci-msvc:
+	$(Q)$(CFG_SRC_DIR)/x.py test --stage 2
 
 ## MingW native builders