From 88f27c423c4339f6f38202a93cf36d66934cba7a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 3 May 2023 18:45:56 -0400 Subject: [PATCH] ci: Launch pipewire and wireplumber The headless tests require pipewire and wireplumber for screencast sessions to work. So launch them. --- testsuite/headless/run-headless-input-tests.sh | 14 ++++++++++++-- testsuite/headless/run-headless-monitor-tests.sh | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/testsuite/headless/run-headless-input-tests.sh b/testsuite/headless/run-headless-input-tests.sh index d62084a28e..53dfeea222 100755 --- a/testsuite/headless/run-headless-input-tests.sh +++ b/testsuite/headless/run-headless-input-tests.sh @@ -4,6 +4,14 @@ srcdir=${MESON_CURRENT_SOURCE_DIR:-./testsuite/headless} dbus-run-session sh <&mutter2.log & -pid=\$! +mutter_pid=\$! export WAYLAND_DISPLAY=gtk-test2 export GDK_BACKEND=wayland @@ -19,7 +27,9 @@ export GDK_BACKEND=wayland python3 ${srcdir}/headless-input-tests.py status=\$? -kill \$pid +kill \$mutter_pid +kill \$wireplumber_pid +kill \$pipewire_pid exit \$status diff --git a/testsuite/headless/run-headless-monitor-tests.sh b/testsuite/headless/run-headless-monitor-tests.sh index 9bd9133f33..7c62766ff5 100755 --- a/testsuite/headless/run-headless-monitor-tests.sh +++ b/testsuite/headless/run-headless-monitor-tests.sh @@ -4,6 +4,14 @@ srcdir=${MESON_CURRENT_SOURCE_DIR:-./testsuite/headless} dbus-run-session sh <&mutter.log & -pid=\$! +mutter_pid=\$! export WAYLAND_DISPLAY=gtk-test export GDK_BACKEND=wayland @@ -19,7 +27,9 @@ export GDK_BACKEND=wayland python3 ${srcdir}/headless-monitor-tests.py status=\$? -kill \$pid +kill \$mutter_pid +kill \$wireplumber_pid +kill \$pipewire_pid exit \$status