[PATCH v2 0/1] MR1255: gitlab: Run win64 tests instead of wow64.
Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/1241. -- v2: gitlab: Run dinput 64-bit tests in a dedicated job. https://gitlab.winehq.org/wine/wine/-/merge_requests/1255
From: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/gitlab/test.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index da34390bc1f..808c825eae9 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -42,6 +42,18 @@ - wine wineboot.exe -u - wineserver -w +test-linux-64: + extends: .wine-test + variables: + INCLUDE_TESTS: "dinput" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + needs: + - 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 + test-linux-32: extends: .wine-test variables: -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1255
Updated to only run dinput tests as a separate 64-bit job. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1255#note_21740
Why is dinput special? Why not run all 64-bit tests? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1255#note_21817
On Wed Jan 25 20:28:00 2023 +0000, Zebediah Figura wrote:
Why is dinput special? Why not run all 64-bit tests? Because running all the tests on the three arch combination would be too long. The "best" choice given the current development angle with WOW is to run wow64 tests only.
However DInput tests don't work with WOW so most of the tests are skipped and the HID stack is currently untested on Gitlab CI for merge requests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1255#note_21859
On Wed Jan 25 20:28:00 2023 +0000, Rémi Bernon wrote:
Because running all the tests on the three arch combination would be too long. The "best" choice given the current development angle with WOW is to run wow64 tests only. However DInput tests don't work with WOW so most of the tests are skipped and the HID stack is currently untested on Gitlab CI for merge requests. We've been able to run all three combinations up until now; what changed?
And, if we can only run two out of three, is it really best to skip 64-bit? If anything I'd think we should skip the 32-bit tests... If nothing else, dinput isn't the only test that's useless under WoW64. In particular ntoskrnl and setupapi also come to mind. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1255#note_21861
We've been able to run all three combinations up until now; what changed?
And, if we can only run two out of three, is it really best to skip 64-bit? If anything I'd think we should skip the 32-bit tests...
No, MRs have only been tested on Gitlab with wow64 only. The testbot also runs the full test suite with 32bit only (though maybe with win32 prefix), and only relevant tests with wow64 / win64. At some point the tesbot was broken so I made this, but I would prefer to have the tests running on Gitlab if possible.
If nothing else, dinput isn't the only test that's useless under WoW64. In particular ntoskrnl and setupapi also come to mind.
Sure, feel free to add more tests to the include list after, and if, this gets merged. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1255#note_21864
Okay, I don't see why we're getting rid of that testbot logic to only run the relevant tests, but I see that water is running downhill in this case, so I'll abstain from further discussion. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1255#note_21865
Okay, I don't see why we're getting rid of that testbot logic to only run the relevant tests, but I see that water is running downhill in this case, so I'll abstain from further discussion.
There are no plans to get rid of that logic, it just hasn't been implemented on Gitlab yet. The priority was to get the full test suite to run first, but adding some more targeted tests is certainly feasible. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1255#note_21869
participants (3)
-
Alexandre Julliard (＠julliard) -
Rémi Bernon
-
Zebediah Figura (＠zfigura)