Commit 1a3a026d authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

gitlab: Only run the modifieds tests on Windows for an MR.

parent 61faaf7e
...@@ -36,6 +36,8 @@ build-linux: ...@@ -36,6 +36,8 @@ build-linux:
- usr/local/ - usr/local/
script: script:
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-linux - 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: build-mac:
extends: .wine-build extends: .wine-build
...@@ -64,9 +66,11 @@ build-winetest: ...@@ -64,9 +66,11 @@ build-winetest:
artifacts: artifacts:
name: winetest name: winetest
paths: paths:
- winetest.args
- winetest.exe - winetest.exe
- winetest64.exe - winetest64.exe
script: 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/i386-windows/winetest.exe winetest.exe
- mv usr/local/lib/wine/x86_64-windows/winetest.exe winetest64.exe - mv usr/local/lib/wine/x86_64-windows/winetest.exe winetest64.exe
......
...@@ -72,7 +72,6 @@ test-win10-21h2-32: ...@@ -72,7 +72,6 @@ test-win10-21h2-32:
interruptible: true interruptible: true
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
EXCLUDE_TESTS: "d3d11:d3d11 d3d9:d3d9ex d3d9:visual"
rules: rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
needs: needs:
...@@ -80,7 +79,8 @@ test-win10-21h2-32: ...@@ -80,7 +79,8 @@ test-win10-21h2-32:
tags: tags:
- win10-21h2 - win10-21h2
script: 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: after_script:
- Get-Content ./winetest.log - Get-Content ./winetest.log
artifacts: artifacts:
...@@ -93,7 +93,6 @@ test-win10-21h2-64: ...@@ -93,7 +93,6 @@ test-win10-21h2-64:
interruptible: true interruptible: true
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
INCLUDE_TESTS: "dinput"
rules: rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
needs: needs:
...@@ -101,7 +100,8 @@ test-win10-21h2-64: ...@@ -101,7 +100,8 @@ test-win10-21h2-64:
tags: tags:
- win10-21h2 - win10-21h2
script: 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: after_script:
- Get-Content ./winetest.log - Get-Content ./winetest.log
artifacts: artifacts:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment