From 8fa5ba844361536135d3d6cb67e3a3f4a1a651f4 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Thu, 19 Sep 2024 11:05:52 -0500
Subject: [PATCH 1/2] add common windows ci test script

---
 .appveyor.yml                      | 5 ++---
 .ci/test.cmd                       | 3 +++
 .github/workflows/test-windows.yml | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 .ci/test.cmd

diff --git a/.appveyor.yml b/.appveyor.yml
index f490561cdcd..7d45e11ee5c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -53,9 +53,8 @@ test_script:
 - cd c:\pillow
 - '%PYTHON%\%EXECUTABLE% -m pip install pytest pytest-cov pytest-timeout defusedxml ipython numpy olefile pyroma'
 - c:\"Program Files (x86)"\"Windows Kits"\10\Debuggers\x86\gflags.exe /p /enable %PYTHON%\%EXECUTABLE%
-- '%PYTHON%\%EXECUTABLE% -c "from PIL import Image"'
-- '%PYTHON%\%EXECUTABLE% -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests'
-#- '%PYTHON%\%EXECUTABLE% test-installed.py -v -s %TEST_OPTIONS%' TODO TEST_OPTIONS with pytest?
+- path %PYTHON%;%PATH%
+- .ci\test.cmd
 
 after_test:
 - curl -Os https://uploader.codecov.io/latest/windows/codecov.exe
diff --git a/.ci/test.cmd b/.ci/test.cmd
new file mode 100644
index 00000000000..aafc9290c80
--- /dev/null
+++ b/.ci/test.cmd
@@ -0,0 +1,3 @@
+python.exe -c "from PIL import Image"
+IF ERRORLEVEL 1 EXIT /B
+python.exe -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index f58e8dae3a6..e36dc05fd09 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -190,8 +190,8 @@ jobs:
 
     - name: Test Pillow
       run: |
-        path %GITHUB_WORKSPACE%\\winbuild\\build\\bin;%PATH%
-        python.exe -m pytest -vx -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests
+        path %GITHUB_WORKSPACE%\winbuild\build\bin;%PATH%
+        .ci\test.cmd
       shell: cmd
 
     - name: Prepare to upload errors

From be3192ecd41581761a78913950ec3fb4be4dd981 Mon Sep 17 00:00:00 2001
From: Yay295 <Yay295@gmail.com>
Date: Thu, 19 Sep 2024 12:08:34 -0500
Subject: [PATCH 2/2] use .ci/test.sh in test-mingw.yml

---
 .ci/test.sh                      | 2 +-
 .github/workflows/test-mingw.yml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.ci/test.sh b/.ci/test.sh
index 8ff7c5f6483..3f0ddc350a9 100755
--- a/.ci/test.sh
+++ b/.ci/test.sh
@@ -4,4 +4,4 @@ set -e
 
 python3 -c "from PIL import Image"
 
-python3 -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term Tests $REVERSE
+python3 -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests $REVERSE
diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml
index e5e1ec32e2b..c7a73439ca9 100644
--- a/.github/workflows/test-mingw.yml
+++ b/.github/workflows/test-mingw.yml
@@ -80,8 +80,7 @@ jobs:
       - name: Test Pillow
         run: |
           python3 selftest.py --installed
-          python3 -c "from PIL import Image"
-          python3 -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests
+          .ci/test.sh
 
       - name: Upload coverage
         uses: codecov/codecov-action@v4