[PATCH 0/1] MR6880: gitlab: Wait for the fvwm process to start.

[Rémi Bernon]

I've seen some cases where the X server is a bit slow to start, and I suspect it could be a reason for some rare spurious test failures. Not 100% sure but at least this should be harmless and better than leaving it to chance.

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

[PATCH 1/1] gitlab: Wait for the fvwm process to start.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 tools/gitlab/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml
index 267b8a80730..25ad6debf7e 100644
--- a/tools/gitlab/test.yml
+++ b/tools/gitlab/test.yml
@@ -35,7 +35,7 @@
       EndSection
       EOF
     - echo 'exec /usr/bin/fvwm -f config -c "Style * MwmDecor" -c "Style * UsePPosition" 2>/dev/null' >$HOME/.xinitrc
-    - startx -- -config $HOME/xorg.conf $DISPLAY &
+    - startx -- -config $HOME/xorg.conf $DISPLAY & while ! pgrep fvwm >/dev/null 2>&1; do sleep 1; done
     - test -f wine-gecko-$GECKO_VER-x86.msi || curl -o wine-gecko-$GECKO_VER-x86.msi https://dl.winehq.org/wine/wine-gecko/$GECKO_VER/wine-gecko-$GECKO_VER-x86.m...
     - test -f wine-gecko-$GECKO_VER-x86_64.msi || curl -o wine-gecko-$GECKO_VER-x86_64.msi https://dl.winehq.org/wine/wine-gecko/$GECKO_VER/wine-gecko-$GECKO_VER-x86_6...
     - test -f wine-mono-$MONO_VER-x86.msi || curl -o wine-mono-$MONO_VER-x86.msi https://dl.winehq.org/wine/wine-mono/$MONO_VER/wine-mono-$MONO_VER-x86.msi
-- 
GitLab

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

[Jinoh Kang (＠iamahuman)]

Jinoh Kang (@iamahuman) commented about tools/gitlab/test.yml:
> EndSection
>        EOF
>      - echo 'exec /usr/bin/fvwm -f config -c "Style * MwmDecor" -c "Style * UsePPosition" 2>/dev/null' >$HOME/.xinitrc
> -    - startx -- -config $HOME/xorg.conf $DISPLAY &
> +    - startx -- -config $HOME/xorg.conf $DISPLAY & while ! pgrep fvwm >/dev/null 2>&1; do sleep 1; done

This should be more reliable as it waits until the actual WM start:

```suggestion:-0+0
    - startx -- -config $HOME/xorg.conf $DISPLAY & while xprop -root _NET_SUPPORTED | grep -q 'no such atom'; do sleep 1; done
```

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6880#note_88569

[Jinoh Kang (＠iamahuman)]

On Fri Nov 22 18:05:19 2024 +0000, Jinoh Kang wrote:
> This should be more reliable as it waits until the actual WM start:
> ```suggestion:-0+0
>     - startx -- -config $HOME/xorg.conf $DISPLAY & while xprop -root
> _NET_SUPPORTED | grep -q 'no such atom'; do sleep 1; done
> ```
> Actually I'm not sure if x11-utils is installed inside the container.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6880#note_88570