[PATCH v2 7/7] gitlab: Use winetest JUnit output mode.

[Rémi Bernon]

From: Rémi Bernon

---
 tools/gitlab/test.yml | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml
index ad2258ce3dd..e5d0602884b 100644
--- a/tools/gitlab/test.yml
+++ b/tools/gitlab/test.yml
@@ -57,7 +57,13 @@ test-linux-64:
     - job: build-linux
   script:
     - export WINETEST_COLOR=1
-    - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL $INCLUDE_TESTS
+    - wine usr/local/lib/wine/x86_64-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -J winetest.xml $INCLUDE_TESTS
+  artifacts:
+    when: always
+    paths:
+      - winetest.xml
+    reports:
+      junit: winetest.xml

test-linux-32:
   extends: .wine-test
@@ -69,7 +75,13 @@ test-linux-32:
     - job: build-linux
   script:
     - export WINETEST_COLOR=1
-    - wine usr/local/lib/wine/i386-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -n $EXCLUDE_TESTS
+    - wine usr/local/lib/wine/i386-windows/winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -J winetest.xml -n $EXCLUDE_TESTS
+  artifacts:
+    when: always
+    paths:
+      - winetest.xml
+    reports:
+      junit: winetest.xml

test-win10-21h2-32:
   stage: test
@@ -84,13 +96,23 @@ test-win10-21h2-32:
     - win10-21h2
   script:
     - $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 }
+    - |
+      if ($WINETEST_ARGS.count -gt 0) {
+        ./winetest.exe -q -q -o - -t gitlab -u $CI_JOB_URL -J winetest.tmp @WINETEST_ARGS >winetest.log
+      } else {
+        echo '<?xml version="1.0" encoding="UTF-8"?><testsuites/>' >winetest.tmp
+        echo $null >winetest.log
+      }
   after_script:
+    - Get-Content ./winetest.tmp | Set-Content -Encoding utf8 winetest.xml
     - Get-Content ./winetest.log
   artifacts:
     when: always
     paths:
+      - winetest.xml
       - winetest.log
+    reports:
+      junit: winetest.xml

test-win10-21h2-64:
   stage: test
@@ -105,13 +127,23 @@ test-win10-21h2-64:
     - win10-21h2
   script:
     - $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 }
+    - |
+      if ($WINETEST_ARGS.count -gt 0) {
+        ./winetest64.exe -q -q -o - -t gitlab -u $CI_JOB_URL -J winetest.tmp @WINETEST_ARGS >winetest.log
+      } else {
+        echo '<?xml version="1.0" encoding="UTF-8"?><testsuites/>' >winetest.tmp
+        echo $null >winetest.log
+      }
   after_script:
+    - Get-Content ./winetest.tmp | Set-Content -Encoding utf8 winetest.xml
     - Get-Content ./winetest.log
   artifacts:
     when: always
     paths:
+      - winetest.xml
       - winetest.log
+    reports:
+      junit: winetest.xml

debian-32:
   extends: .wine-test