File tree Expand file tree Collapse file tree 2 files changed +22
-5
lines changed Expand file tree Collapse file tree 2 files changed +22
-5
lines changed Original file line number Diff line number Diff line change 9797prepare :
9898 $(Q )$(BOOTSTRAP ) build --stage 2 --dry-run
9999
100+ # Set of tests that represent around half of the time of the test suite.
101+ # Used to split tests across multiple CI runners.
102+ STAGE_2_TEST_SET1 := test --stage 2 --skip=compiler --skip=src
103+ STAGE_2_TEST_SET2 := test --stage 2 --skip=tests --skip=coverage-map --skip=coverage-run --skip=library --skip=tidyselftest
104+
100105# # MSVC native builders
101106
102107# this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows
@@ -105,16 +110,20 @@ ci-msvc-py:
105110ci-msvc-ps1 :
106111 $(Q )$(CFG_SRC_DIR ) /x.ps1 test --stage 2 --skip tidy
107112ci-msvc : ci-msvc-py ci-msvc-ps1
113+ ci-msvc-py-set1 :
114+ $(Q )$(CFG_SRC_DIR ) /x.py $(STAGE_2_TEST_SET1 )
115+ ci-msvc-ps1-set2 :
116+ $(Q )$(CFG_SRC_DIR ) /x.ps1 $(STAGE_2_TEST_SET2 )
108117
109118# # MingW native builders
110119
111120# Set of tests that should represent half of the time of the test suite.
112121# Used to split tests across multiple CI runners.
113122# Test both x and bootstrap entrypoints.
114123ci-mingw-x :
115- $(Q )$(CFG_SRC_DIR ) /x test --stage 2 --skip=compiler --skip=src
124+ $(Q )$(CFG_SRC_DIR ) /x $( STAGE_2_TEST_SET1 )
116125ci-mingw-bootstrap :
117- $(Q )$(BOOTSTRAP ) test --stage 2 --skip=tests --skip=coverage-map --skip=coverage-run --skip=library --skip=tidyselftest
126+ $(Q )$(BOOTSTRAP ) $( STAGE_2_TEST_SET2 )
118127ci-mingw : ci-mingw-x ci-mingw-bootstrap
119128
120129.PHONY : dist
Original file line number Diff line number Diff line change @@ -448,11 +448,19 @@ auto:
448448 SCRIPT : make ci-msvc
449449 << : *job-windows-8c
450450
451- - name : i686-msvc
451+ # i686-msvc is split into two jobs to run tests in parallel.
452+ - name : i686-msvc-1
452453 env :
453454 RUST_CONFIGURE_ARGS : --build=i686-pc-windows-msvc
454- SCRIPT : make ci-msvc
455- << : *job-windows-8c
455+ SCRIPT : make ci-msvc-py-set1
456+ << : *job-windows
457+
458+ # i686-msvc is split into two jobs to run tests in parallel.
459+ - name : i686-msvc-2
460+ env :
461+ RUST_CONFIGURE_ARGS : --build=i686-pc-windows-msvc
462+ SCRIPT : make ci-msvc-ps1-set2
463+ << : *job-windows
456464
457465 # x86_64-msvc-ext is split into multiple jobs to run tests in parallel.
458466 - name : x86_64-msvc-ext1
You can’t perform that action at this time.
0 commit comments