summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2023-05-03 19:54:41 -0400
committerMatthias Clasen <mclasen@redhat.com>2023-05-03 23:27:09 -0400
commit926b26e9fcd49e993ad0fbf509cc0bd13d3bdb90 (patch)
treea34a9ad073c65f0d32501f00044448fa5da3b697
parent88f27c423c4339f6f38202a93cf36d66934cba7a (diff)
downloadgtk+-926b26e9fcd49e993ad0fbf509cc0bd13d3bdb90.tar.gz
headless tests: Add debug spew
Trying to track down what is going on with our missing monitors.
-rw-r--r--testsuite/headless/headless-monitor-tests.py4
-rwxr-xr-xtestsuite/headless/run-headless-monitor-tests.sh6
2 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/headless/headless-monitor-tests.py b/testsuite/headless/headless-monitor-tests.py
index 48aebd8a7c..c556a7bb92 100644
--- a/testsuite/headless/headless-monitor-tests.py
+++ b/testsuite/headless/headless-monitor-tests.py
@@ -36,10 +36,10 @@ def stream_added_closure(name):
# Use gstreamer out-of-process, since the gst gl support gets
# itself into a twist with its wayland connection when monitors
# disappear
- pipeline_desc = f'gst-launch-1.0 pipewiresrc path={node_id} ! video/x-raw,max-framerate={freq}/1,width={width},height={height} ! videoconvert ! glimagesink'
+ pipeline_desc = f'gst-launch-1.0 --verbose pipewiresrc path={node_id} ! video/x-raw,max-framerate={freq}/1,width={width},height={height} ! videoconvert ! glimagesink'
if verbose:
print(f'launching {pipeline_desc}')
- monitor['pipeline'] = subprocess.Popen([pipeline_desc], shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+ monitor['pipeline'] = subprocess.Popen([pipeline_desc], shell=True)
return stream_added
diff --git a/testsuite/headless/run-headless-monitor-tests.sh b/testsuite/headless/run-headless-monitor-tests.sh
index 7c62766ff5..d2944e80a2 100755
--- a/testsuite/headless/run-headless-monitor-tests.sh
+++ b/testsuite/headless/run-headless-monitor-tests.sh
@@ -2,6 +2,9 @@
srcdir=${MESON_CURRENT_SOURCE_DIR:-./testsuite/headless}
+export GTK_A11Y=none
+export GIO_USE_VFS=local
+
dbus-run-session sh <<EOF
export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
@@ -15,9 +18,6 @@ sleep 1
# echo DBUS_SESSION_BUS_ADDRESS=\$DBUS_SESSION_BUS_ADDRESS
# echo WAYLAND_DISPLAY=gtk-test
-export GTK_A11Y=none
-export GIO_USE_VFS=local
-
mutter --headless --no-x11 --wayland-display gtk-test >&mutter.log &
mutter_pid=\$!