[PATCH v2 2/2] gitlab: Only run the modifieds tests on Windows for an MR.

[Rémi Bernon]

From: Rémi Bernon

---
 tools/gitlab/build.yml | 4 ++++
 tools/gitlab/test.yml  | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml
index 47b677254cc..d0e6ef5bc8f 100644
--- a/tools/gitlab/build.yml
+++ b/tools/gitlab/build.yml
@@ -36,6 +36,8 @@ build-linux:
       - usr/local/
   script:
     - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux
+    - git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA | sed -re '//tests//!d; s@/tests/.*@/tests/Makefile.in@' |
+      (xargs -r ls 2>/dev/null || true) | xargs -r sed '/TESTDLL/!d; s@.dll@@; s@.*= *@@' >usr/local/share/wine/winetest.args

.build-mac:
   extends: .wine-build
@@ -64,9 +66,11 @@ build-winetest:
   artifacts:
     name: winetest
     paths:
+      - winetest.args
       - winetest.exe
       - winetest64.exe
   script:
+    - mv usr/local/share/wine/winetest.args winetest.args
     - mv usr/local/lib/wine/i386-windows/winetest.exe winetest.exe
     - mv usr/local/lib/wine/x86_64-windows/winetest.exe winetest64.exe

diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml
index 365135f2bc7..6b5f79a8776 100644
--- a/tools/gitlab/test.yml
+++ b/tools/gitlab/test.yml
@@ -72,7 +72,6 @@ test-win10-21h2-32:
   interruptible: true
   variables:
     GIT_STRATEGY: none
-    EXCLUDE_TESTS: "d3d11:d3d11 d3d9:d3d9ex d3d9:visual"
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   needs:
@@ -80,7 +79,8 @@ test-win10-21h2-32:
   tags:
     - win10-21h2
   script:
-    - ./winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -n $EXCLUDE_TESTS >winetest.log
+    - $WINETEST_ARGS = Get-Content ./winetest.args
+    - if ($WINETEST_ARGS.count -gt 0) { ./winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL @WINETEST_ARGS >winetest.log } else { echo $null >winetest.log }
   after_script:
     - Get-Content ./winetest.log
   artifacts:
@@ -93,7 +93,6 @@ test-win10-21h2-64:
   interruptible: true
   variables:
     GIT_STRATEGY: none
-    INCLUDE_TESTS: "dinput"
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   needs:
@@ -101,7 +100,8 @@ test-win10-21h2-64:
   tags:
     - win10-21h2
   script:
-    - ./winetest64.exe -q -q -o - -t gitlab -u $CI_JOB_URL $INCLUDE_TESTS >winetest.log
+    - $WINETEST_ARGS = Get-Content ./winetest.args
+    - if ($WINETEST_ARGS.count -gt 0) { ./winetest64.exe -q -q -o - -t gitlab -u $CI_JOB_URL @WINETEST_ARGS >winetest.log } else { echo $null >winetest.log }
   after_script:
     - Get-Content ./winetest.log
   artifacts: