about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-08-16 17:02:01 +0200
committerPietro Albini <pietro@pietroalbini.org>2019-08-16 17:02:01 +0200
commit9df2dac4e9b92c4ced0fdc746aacdb4b1f6302b1 (patch)
tree366b23e4444d449f83fc01bcc769ee0bfbcc59af /src/bootstrap
parent5a6d801bf9399004a0f0a19e510d996f4686c093 (diff)
downloadrust-9df2dac4e9b92c4ced0fdc746aacdb4b1f6302b1.tar.gz
rust-9df2dac4e9b92c4ced0fdc746aacdb4b1f6302b1.zip
ci: move linkcheck from mingw-2 to mingw-1
Running UI tests now takes a huge amount of time on mingw builders
(between 40 and 50 minutes), with mingw-1 builders taking even an hour
less to finish than mingw-2. This PR moves linkcheck from mingw-2 to
mingw-1, removing between 10 and 20 minutes of runtime on the -2
builders.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/mk/Makefile.in9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 73d6fe532c8..e0a1f46078d 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -81,5 +81,14 @@ ci-subset-1:
 ci-subset-2:
 	$(Q)$(BOOTSTRAP) test $(TESTS_IN_2)
 
+TESTS_IN_MINGW_2 := \
+	src/test/ui \
+	src/test/compile-fail
+
+ci-mingw-subset-1:
+	$(Q)$(BOOTSTRAP) test $(TESTS_IN_MINGW_2:%=--exclude %)
+ci-mingw-subset-2:
+	$(Q)$(BOOTSTRAP) test $(TESTS_IN_MINGW_2)
+
 
 .PHONY: dist