lkn
/
windowmaker-wl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: smoke test — accept headless or nested compositor mode 

WMAKER_WAYLAND_NESTED=0 no longer forces headless when WAYLAND_DISPLAY
is set (auto-detect wins), so the mode check now accepts either
"headless compositor mode" or "nested Wayland compositor mode" and
reports whichever was logged.  Remove the now-useless NESTED=0 override
from the launch line.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Levi Neely 2026-03-30 11:28:17 +02:00
parent 9104a1944f
commit 177e13f995
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/wl-smoke-test.sh
View File

@ -179,7 +179,7 @@ if [ -z "$XDG_RUNTIME_DIR" ]; then
export XDG_RUNTIME_DIR
fi
WMAKER_USE_WAYLAND=1 WMAKER_WAYLAND_NESTED=0 src/wmaker \
WMAKER_USE_WAYLAND=1 src/wmaker \
--no-dock --no-clip --no-autolaunch \
--dont-restore --static \
--for-real 2>/tmp/wl-smoke-stderr &
@ -287,13 +287,14 @@ fi
# succeeds (both nested and headless modes).
grep -q 'scene graph created' /tmp/wl-smoke-stderr \
|| die "compositor did not log scene graph creation (wlr_scene_create failed)"
# Verify headless compositor mode (WMAKER_WAYLAND_NESTED not set in test)
grep -q 'headless compositor mode' /tmp/wl-smoke-stderr \
|| die "compositor did not log headless compositor mode"
# Verify compositor mode (headless or nested — auto-detected from WAYLAND_DISPLAY)
grep -qE 'headless compositor mode|nested Wayland compositor mode' /tmp/wl-smoke-stderr \
|| die "compositor did not log compositor mode (neither headless nor nested)"
WL_MODE=$(grep -oE 'headless compositor mode|nested Wayland compositor mode' /tmp/wl-smoke-stderr | head -1)
# Verify scene_output was created in handle_backend_new_output (ordering fix)
grep -q 'scene output created' /tmp/wl-smoke-stderr \
|| die "compositor did not log scene output creation (scene was NULL in new_output handler)"
echo " scene check: scene graph created + scene_output wired (headless compositor mode)"
echo " scene check: scene graph created + scene_output wired ($WL_MODE)"
# -- 5. Core Wayland globals must be advertised ---------------------------
#