This repository was archived by the owner on May 28, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +33
-9
lines changed Expand file tree Collapse file tree 2 files changed +33
-9
lines changed Original file line number Diff line number Diff line change @@ -99,27 +99,31 @@ prepare:
9999
100100# Set of tests that represent around half of the time of the test suite.
101101# 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
102+ TEST_SET1 := --skip=compiler --skip=src
103+ TEST_SET2 := --skip=tests --skip=coverage-map --skip=coverage-run --skip=library --skip=tidyselftest
104104
105105# # MSVC native builders
106106
107107# this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows
108108ci-msvc-py :
109- $(Q )$(CFG_SRC_DIR ) /x.py $( STAGE_2_TEST_SET1 )
109+ $(Q )$(CFG_SRC_DIR ) /x.py test --stage 2 $( TEST_SET1 )
110110ci-msvc-ps1 :
111- $(Q )$(CFG_SRC_DIR ) /x.ps1 $( STAGE_2_TEST_SET2 )
111+ $(Q )$(CFG_SRC_DIR ) /x.ps1 test --stage 2 $( TEST_SET2 )
112112ci-msvc : ci-msvc-py ci-msvc-ps1
113113
114114# # MingW native builders
115115
116116# Set of tests that should represent half of the time of the test suite.
117117# Used to split tests across multiple CI runners.
118118# Test both x and bootstrap entrypoints.
119+ ci-mingw-x-1 :
120+ $(Q )$(CFG_SRC_DIR ) /x test --stage 2 --skip=compiler $(TEST_SET2 )
121+ ci-mingw-x-2 :
122+ $(Q )$(CFG_SRC_DIR ) /x test --stage 2 --skip=src $(TEST_SET2 )
119123ci-mingw-x :
120- $(Q )$(CFG_SRC_DIR ) /x $( STAGE_2_TEST_SET1 )
124+ $(Q )$(CFG_SRC_DIR ) /x test --stage 2 $( TEST_SET1 )
121125ci-mingw-bootstrap :
122- $(Q )$(BOOTSTRAP ) $( STAGE_2_TEST_SET2 )
126+ $(Q )$(BOOTSTRAP ) test --stage 2 $( TEST_SET2 )
123127ci-mingw : ci-mingw-x ci-mingw-bootstrap
124128
125129.PHONY : dist
Original file line number Diff line number Diff line change @@ -446,6 +446,7 @@ auto:
446446 # Windows Builders #
447447 # #####################
448448
449+ # x86_64-msvc is split into two jobs to run tests in parallel.
449450 - name : x86_64-msvc-1
450451 env :
451452 RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-msvc --enable-profiler
@@ -517,14 +518,33 @@ auto:
517518 # came from the mingw-w64 SourceForge download site. Unfortunately
518519 # SourceForge is notoriously flaky, so we mirror it on our own infrastructure.
519520
520- - name : i686-mingw
521+ # i686-mingw is split into two jobs to run tests in parallel.
522+ - name : i686-mingw-1
521523 env :
522524 RUST_CONFIGURE_ARGS : --build=i686-pc-windows-gnu
523- SCRIPT : make ci-mingw
525+ SCRIPT : make ci-mingw-x-1
524526 # We are intentionally allowing an old toolchain on this builder (and that's
525527 # incompatible with LLVM downloads today).
526528 NO_DOWNLOAD_CI_LLVM : 1
527- << : *job-windows-8c
529+ << : *job-windows-25
530+
531+ - name : i686-mingw-2
532+ env :
533+ RUST_CONFIGURE_ARGS : --build=i686-pc-windows-gnu
534+ SCRIPT : make ci-mingw-x-2
535+ # We are intentionally allowing an old toolchain on this builder (and that's
536+ # incompatible with LLVM downloads today).
537+ NO_DOWNLOAD_CI_LLVM : 1
538+ << : *job-windows-25
539+
540+ - name : i686-mingw-3
541+ env :
542+ RUST_CONFIGURE_ARGS : --build=i686-pc-windows-gnu
543+ SCRIPT : make ci-mingw-bootstrap
544+ # We are intentionally allowing an old toolchain on this builder (and that's
545+ # incompatible with LLVM downloads today).
546+ NO_DOWNLOAD_CI_LLVM : 1
547+ << : *job-windows-25
528548
529549 # x86_64-mingw is split into two jobs to run tests in parallel.
530550 - name : x86_64-mingw-1
You can’t perform that action at this time.
0 commit comments