[PATCH v3 0/1] MR7108: tools: Add manual-run job for new-style wow64.

[Jinoh Kang (＠iamahuman)]

The new job is only triggered when a developer manually starts it.
Before run, it initially appears as a "skipped" job when the pipeline
starts.

--
  v3: tools: Add manual-run job for new-style wow64.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7108

[PATCH v3 1/1] tools: Add manual-run job for new-style wow64.

[Jinoh Kang]

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com>

The new job is only triggered when a developer manually starts it.
Before run, it initially appears as a "skipped" job when the pipeline
starts.
---
 tools/gitlab/test.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml
index dc3a1595a1a..ce4ae4f7fa4 100644
--- a/tools/gitlab/test.yml
+++ b/tools/gitlab/test.yml
@@ -22,6 +22,12 @@
       printf '\e[36;1mPreparing environment for Wine\e[0m\n'
     - export BASEDIR=$PWD
     - export PATH=$BASEDIR/usr/local/bin:$PATH
+    - |
+      if [ "${USE_32ON64-}" ]
+      then
+        mv -f "$BASEDIR/usr/local/bin/wine64" "$BASEDIR/usr/local/bin/wine"
+        mv -f "$BASEDIR/usr/local/bin/wine64-preloader" "$BASEDIR/usr/local/bin/wine-preloader"
+      fi
     - export DISPLAY=:0
     - export LC_ALL=C.UTF-8
     - export LP_NUM_THREADS=4
@@ -65,6 +71,26 @@ test-linux-64:
     reports:
       junit: winetest.xml
 
+test-linux-32on64:
+  extends: .wine-test
+  variables:
+    EXCLUDE_TESTS: "d3d11:d3d11 d3d9:d3d9ex d3d9:visual"
+    USE_32ON64: "1"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: manual
+  needs:
+    - job: build-linux
+  script:
+    - export WINETEST_COLOR=1
+    - wine usr/local/lib/wine/i386-windows/winetest.exe -q -q -o - -J winetest.xml -n $EXCLUDE_TESTS
+  artifacts:
+    when: always
+    paths:
+      - winetest.xml
+    reports:
+      junit: winetest.xml
+
 test-linux-32:
   extends: .wine-test
   variables:
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7108

[PATCH v3 1/1] tools: Add manual-run job for new-style wow64.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=150846

Your paranoid android.


=== debian11b (64 bit WoW report) ===

kernel32:
comm.c:1574: Test failed: AbortWaitCts hComPortEvent failed
comm.c:1586: Test failed: Unexpected time 1000, expected around 500

Report validation errors:
mshtml:script crashed (c0000005)