From 59f649fcab7f91607da5eb8a73165f14f54c444c Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:47:48 +0100
Subject: [PATCH 01/21] CI: split x86_64-mingw job

---
 src/ci/github-actions/jobs.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 340dfd67b7dd7..b076c4133b100 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -431,9 +431,18 @@ auto:
       NO_DOWNLOAD_CI_LLVM: 1
     <<: *job-windows-8c
 
-  - image: x86_64-mingw
+  - image: x86_64-mingw-1
     env:
-      SCRIPT: make ci-mingw
+      SCRIPT: make ci-mingw-x
+      RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
+      # We are intentionally allowing an old toolchain on this builder (and that's
+      # incompatible with LLVM downloads today).
+      NO_DOWNLOAD_CI_LLVM: 1
+    <<: *job-windows-8c
+
+  - image: x86_64-mingw-2
+    env:
+      SCRIPT: make ci-mingw-bootstrap
       RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
       # We are intentionally allowing an old toolchain on this builder (and that's
       # incompatible with LLVM downloads today).

From 4ad4a0608025fcce9135fe5f0b04fb79dd26e732 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Fri, 15 Nov 2024 10:39:45 +0100
Subject: [PATCH 02/21] update isKnownToBeMingwBuild function

---
 src/ci/shared.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ci/shared.sh b/src/ci/shared.sh
index 1e6a008a5de81..5349bb44c1a9d 100644
--- a/src/ci/shared.sh
+++ b/src/ci/shared.sh
@@ -53,7 +53,8 @@ function isLinux {
 }
 
 function isKnownToBeMingwBuild {
-    isGitHubActions && [[ "${CI_JOB_NAME}" == *mingw ]]
+    # CI_JOB_NAME must contain "mingw" to be considered a MinGW build.
+    isGitHubActions && [[ "${CI_JOB_NAME}" == *mingw* ]]
 }
 
 function isCiBranch {

From 02f4cbc49f7e3ca4d3b2557b891fe2ea363510d1 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Fri, 15 Nov 2024 12:16:38 +0100
Subject: [PATCH 03/21] split test suite

---
 src/bootstrap/mk/Makefile.in | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 92c8f5dc452fc..95639d13a7a2e 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -108,11 +108,16 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 ## MingW native builders
 
+# Set of tests that should represent half of the time of the test suite.
+# Used to split tests across multiple CI runners.
+TESTS_IN_MINGW_2 := \
+	tests/ui
+
 # test both x and bootstrap entrypoints
 ci-mingw-x:
-	$(Q)$(CFG_SRC_DIR)/x test --stage 2 tidy
+	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_2:%=--exclude %)
 ci-mingw-bootstrap:
-	$(Q)$(BOOTSTRAP) test --stage 2 --skip tidy
+	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_2)
 ci-mingw: ci-mingw-x ci-mingw-bootstrap
 
 .PHONY: dist

From 0d02d12ad16493dd8e3e76407a558794867b06cd Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Fri, 15 Nov 2024 14:27:04 +0100
Subject: [PATCH 04/21] fix typo

---
 src/bootstrap/mk/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 95639d13a7a2e..05b1d178bf656 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -115,9 +115,9 @@ TESTS_IN_MINGW_2 := \
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:
-	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_2:%=--exclude %)
+	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_2:%=--exclude %)
 ci-mingw-bootstrap:
-	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_2)
+	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_2)
 ci-mingw: ci-mingw-x ci-mingw-bootstrap
 
 .PHONY: dist

From 12c60bae14dfa51ffcd387b93dbea6f6621c9229 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Fri, 15 Nov 2024 16:29:19 +0100
Subject: [PATCH 05/21] test free runner

---
 src/ci/github-actions/jobs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index b076c4133b100..9126a1840efce 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -447,7 +447,7 @@ auto:
       # We are intentionally allowing an old toolchain on this builder (and that's
       # incompatible with LLVM downloads today).
       NO_DOWNLOAD_CI_LLVM: 1
-    <<: *job-windows-8c
+    <<: *job-windows
 
   - image: dist-x86_64-msvc
     env:

From 7abac96ac20bdcb7818f05a956966d32c23b4ed5 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 18 Nov 2024 12:10:37 +0100
Subject: [PATCH 06/21] download llvm

---
 src/ci/github-actions/jobs.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 9126a1840efce..58fe491b6337d 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -435,18 +435,12 @@ auto:
     env:
       SCRIPT: make ci-mingw-x
       RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
-      # We are intentionally allowing an old toolchain on this builder (and that's
-      # incompatible with LLVM downloads today).
-      NO_DOWNLOAD_CI_LLVM: 1
     <<: *job-windows-8c
 
   - image: x86_64-mingw-2
     env:
       SCRIPT: make ci-mingw-bootstrap
       RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
-      # We are intentionally allowing an old toolchain on this builder (and that's
-      # incompatible with LLVM downloads today).
-      NO_DOWNLOAD_CI_LLVM: 1
     <<: *job-windows
 
   - image: dist-x86_64-msvc

From e497da07e9793015aae95c9b91ba46acab6b388a Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 18 Nov 2024 12:11:39 +0100
Subject: [PATCH 07/21] balance tests

---
 src/bootstrap/mk/Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 05b1d178bf656..49296f6f62f4f 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -112,6 +112,8 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 # Used to split tests across multiple CI runners.
 TESTS_IN_MINGW_2 := \
 	tests/ui
+	src/tools/rust-analyzer
+	src/tools/cargo
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:

From ad2db21b337e5ad55f293fd2bf9408a7c2fd2f82 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 18 Nov 2024 12:53:21 +0100
Subject: [PATCH 08/21] fix makefile

---
 src/bootstrap/mk/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 49296f6f62f4f..74b037aa3aa4a 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -111,8 +111,8 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 # Set of tests that should represent half of the time of the test suite.
 # Used to split tests across multiple CI runners.
 TESTS_IN_MINGW_2 := \
-	tests/ui
-	src/tools/rust-analyzer
+	tests/ui \
+	src/tools/rust-analyzer \
 	src/tools/cargo
 
 # test both x and bootstrap entrypoints

From 0f176c85ccce7c64a5be1cc0990f574d9056cde5 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 18 Nov 2024 12:59:53 +0100
Subject: [PATCH 09/21] change mingw regex

---
 src/ci/shared.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ci/shared.sh b/src/ci/shared.sh
index 5349bb44c1a9d..9fce68947f429 100644
--- a/src/ci/shared.sh
+++ b/src/ci/shared.sh
@@ -53,8 +53,8 @@ function isLinux {
 }
 
 function isKnownToBeMingwBuild {
-    # CI_JOB_NAME must contain "mingw" to be considered a MinGW build.
-    isGitHubActions && [[ "${CI_JOB_NAME}" == *mingw* ]]
+    # CI_JOB_NAME must end with "mingw" and optionally `-N` to be considered a MinGW build.
+    isGitHubActions && [[ "${CI_JOB_NAME}" =~ mingw(-[0-9]+)?$ ]]
 }
 
 function isCiBranch {

From 8a95be3d2114249930849621048de86be465a52e Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 18 Nov 2024 13:04:29 +0100
Subject: [PATCH 10/21] Revert "download llvm"

This reverts commit 7abac96ac20bdcb7818f05a956966d32c23b4ed5.
---
 src/ci/github-actions/jobs.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 58fe491b6337d..9126a1840efce 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -435,12 +435,18 @@ auto:
     env:
       SCRIPT: make ci-mingw-x
       RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
+      # We are intentionally allowing an old toolchain on this builder (and that's
+      # incompatible with LLVM downloads today).
+      NO_DOWNLOAD_CI_LLVM: 1
     <<: *job-windows-8c
 
   - image: x86_64-mingw-2
     env:
       SCRIPT: make ci-mingw-bootstrap
       RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu
+      # We are intentionally allowing an old toolchain on this builder (and that's
+      # incompatible with LLVM downloads today).
+      NO_DOWNLOAD_CI_LLVM: 1
     <<: *job-windows
 
   - image: dist-x86_64-msvc

From b35267bbb6a0cad01188ad2a88b1ea49cddfad8b Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Mon, 18 Nov 2024 13:05:49 +0100
Subject: [PATCH 11/21] switch mingw-1 job to free runners

---
 src/ci/github-actions/jobs.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 9126a1840efce..4ca7a58547837 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -431,6 +431,7 @@ auto:
       NO_DOWNLOAD_CI_LLVM: 1
     <<: *job-windows-8c
 
+  # x86_64-mingw is split into two jobs to run tests in parallel.
   - image: x86_64-mingw-1
     env:
       SCRIPT: make ci-mingw-x
@@ -438,7 +439,7 @@ auto:
       # We are intentionally allowing an old toolchain on this builder (and that's
       # incompatible with LLVM downloads today).
       NO_DOWNLOAD_CI_LLVM: 1
-    <<: *job-windows-8c
+    <<: *job-windows
 
   - image: x86_64-mingw-2
     env:

From 19b70e705780532113d8008ec8a352626c644d9c Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:23:21 +0100
Subject: [PATCH 12/21] try fixing test split

---
 src/bootstrap/mk/Makefile.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 74b037aa3aa4a..5f40df696553c 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -112,14 +112,14 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 # Used to split tests across multiple CI runners.
 TESTS_IN_MINGW_2 := \
 	tests/ui \
-	src/tools/rust-analyzer \
-	src/tools/cargo
+	rust-analyzer \
+	cargo
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:
-	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_2:%=--exclude %)
+	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_2)
 ci-mingw-bootstrap:
-	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_2)
+	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_2:%=--skip %)
 ci-mingw: ci-mingw-x ci-mingw-bootstrap
 
 .PHONY: dist

From c2908fa9ec8b3589093676b96d3e8f68dd3d5dd2 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:19:46 +0100
Subject: [PATCH 13/21] split using stage 2 tests only

---
 src/bootstrap/mk/Makefile.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 5f40df696553c..881128269dcf1 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -112,8 +112,11 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 # Used to split tests across multiple CI runners.
 TESTS_IN_MINGW_2 := \
 	tests/ui \
-	rust-analyzer \
-	cargo
+	tests/rustdoc \
+	tests/run-make \
+	tests/rustdoc-ui \
+	tests/ui-fulldeps \
+	tests/rustdoc-json
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:

From d06081f4ccb9faa46cab558d30392fe8b02ede0e Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Tue, 19 Nov 2024 18:30:33 +0100
Subject: [PATCH 14/21] rename tests

---
 src/bootstrap/mk/Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 881128269dcf1..b946783cbee08 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -110,7 +110,7 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # Set of tests that should represent half of the time of the test suite.
 # Used to split tests across multiple CI runners.
-TESTS_IN_MINGW_2 := \
+TESTS_IN_MINGW_X := \
 	tests/ui \
 	tests/rustdoc \
 	tests/run-make \
@@ -120,9 +120,9 @@ TESTS_IN_MINGW_2 := \
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:
-	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_2)
+	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_X)
 ci-mingw-bootstrap:
-	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_2:%=--skip %)
+	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_X:%=--skip %)
 ci-mingw: ci-mingw-x ci-mingw-bootstrap
 
 .PHONY: dist

From e882301f56b214aae6f23202cdc551294ad19646 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Wed, 20 Nov 2024 15:54:44 +0100
Subject: [PATCH 15/21] select all tests under the `tests/` dir

---
 src/bootstrap/mk/Makefile.in | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index b946783cbee08..36f1fbc4139c7 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -110,13 +110,7 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # Set of tests that should represent half of the time of the test suite.
 # Used to split tests across multiple CI runners.
-TESTS_IN_MINGW_X := \
-	tests/ui \
-	tests/rustdoc \
-	tests/run-make \
-	tests/rustdoc-ui \
-	tests/ui-fulldeps \
-	tests/rustdoc-json
+TESTS_IN_MINGW_X := tests/*
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:

From 4b9587d92838aaefe38b081e4a9d380c9ce5904e Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Wed, 20 Nov 2024 16:24:33 +0100
Subject: [PATCH 16/21] escape character in makefile

---
 src/bootstrap/mk/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 36f1fbc4139c7..0d32530ea340d 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -110,7 +110,7 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # Set of tests that should represent half of the time of the test suite.
 # Used to split tests across multiple CI runners.
-TESTS_IN_MINGW_X := tests/*
+TESTS_IN_MINGW_X := tests/\*
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:

From 986e651c2bf3e3ba2e1a1810a0f22666325e7c47 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Wed, 20 Nov 2024 17:40:40 +0100
Subject: [PATCH 17/21] fix makefile

---
 src/bootstrap/mk/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 0d32530ea340d..8a08fc3a7a977 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -110,7 +110,7 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # Set of tests that should represent half of the time of the test suite.
 # Used to split tests across multiple CI runners.
-TESTS_IN_MINGW_X := tests/\*
+TESTS_IN_MINGW_X := tests/
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:

From da464891a43aee937dcdc0b2588cd438d07da37f Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:28:40 +0100
Subject: [PATCH 18/21] escape

---
 src/bootstrap/mk/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 8a08fc3a7a977..c253a6164f31f 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -110,7 +110,7 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # Set of tests that should represent half of the time of the test suite.
 # Used to split tests across multiple CI runners.
-TESTS_IN_MINGW_X := tests/
+TESTS_IN_MINGW_X := tests\/
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:

From af15021539df532e35f1d28f69c12be19c52f5fd Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Thu, 21 Nov 2024 13:52:50 +0100
Subject: [PATCH 19/21] simplify

---
 src/bootstrap/mk/Makefile.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index c253a6164f31f..ce9ced9cf2cae 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -110,13 +110,12 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # Set of tests that should represent half of the time of the test suite.
 # Used to split tests across multiple CI runners.
-TESTS_IN_MINGW_X := tests\/
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:
-	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_X)
+	$(Q)$(CFG_SRC_DIR)/x test --stage 2 tests/
 ci-mingw-bootstrap:
-	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_X:%=--skip %)
+	$(Q)$(BOOTSTRAP) test --stage 2 --skip tests/
 ci-mingw: ci-mingw-x ci-mingw-bootstrap
 
 .PHONY: dist

From 037bdb1e81c396fbd248671ef95e2d1eae35b0e1 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Thu, 21 Nov 2024 15:52:20 +0100
Subject: [PATCH 20/21] restore old test list for testing

---
 src/bootstrap/mk/Makefile.in | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index ce9ced9cf2cae..b946783cbee08 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -110,12 +110,19 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # Set of tests that should represent half of the time of the test suite.
 # Used to split tests across multiple CI runners.
+TESTS_IN_MINGW_X := \
+	tests/ui \
+	tests/rustdoc \
+	tests/run-make \
+	tests/rustdoc-ui \
+	tests/ui-fulldeps \
+	tests/rustdoc-json
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:
-	$(Q)$(CFG_SRC_DIR)/x test --stage 2 tests/
+	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_X)
 ci-mingw-bootstrap:
-	$(Q)$(BOOTSTRAP) test --stage 2 --skip tests/
+	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_X:%=--skip %)
 ci-mingw: ci-mingw-x ci-mingw-bootstrap
 
 .PHONY: dist

From 0a084e31bd12be2813417fe4fa18d6fdd1e1cb88 Mon Sep 17 00:00:00 2001
From: MarcoIeni <11428655+MarcoIeni@users.noreply.github.com>
Date: Thu, 21 Nov 2024 16:01:28 +0100
Subject: [PATCH 21/21] remove x for testing

---
 src/bootstrap/mk/Makefile.in | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index b946783cbee08..362b8a4fbeb39 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -110,19 +110,12 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
 
 # Set of tests that should represent half of the time of the test suite.
 # Used to split tests across multiple CI runners.
-TESTS_IN_MINGW_X := \
-	tests/ui \
-	tests/rustdoc \
-	tests/run-make \
-	tests/rustdoc-ui \
-	tests/ui-fulldeps \
-	tests/rustdoc-json
 
 # test both x and bootstrap entrypoints
 ci-mingw-x:
-	$(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_X)
+	$(Q)$(BOOTSTRAP) test --stage 2 tests/
 ci-mingw-bootstrap:
-	$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_X:%=--skip %)
+	$(Q)$(BOOTSTRAP) test --stage 2 --skip tests/
 ci-mingw: ci-mingw-x ci-mingw-bootstrap
 
 .PHONY: dist