From 177e13f995d65bde48a60be6e6758900a46c376d Mon Sep 17 00:00:00 2001 From: Levi Neely Date: Mon, 30 Mar 2026 11:28:17 +0200 Subject: [PATCH] =?UTF-8?q?wayland:=20smoke=20test=20=E2=80=94=20accept=20?= =?UTF-8?q?headless=20or=20nested=20compositor=20mode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tests/wl-smoke-test.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/wl-smoke-test.sh b/tests/wl-smoke-test.sh index 1d05c71..cf17316 100755 --- a/tests/wl-smoke-test.sh +++ b/tests/wl-smoke-test.sh @@ -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 --------------------------- #