From a66c820d057088f96c58b730862f26a56be8c408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 27 Jun 2022 10:41:35 +0200
Subject: [PATCH] tests/get-state: Run with G_DEBUG=fatal-warnings

For this to pass, pass an explicit Wayland display name to avoid the
display conflict warning that may happen when there is an already
running Wayland display server.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2448>
---
 src/tests/meson.build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/tests/meson.build b/src/tests/meson.build
index 5a9d17bbb..6d2105332 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -430,15 +430,19 @@ if have_x11
   )
 endif
 
+tools_test_env = test_env
+tools_test_env.set('G_DEBUG', 'fatal-warnings')
+
 test('get-state-tool-gio', mutter,
   args: [
     '--headless',
     '--mutter-plugin=@0@'.format(default_plugin.full_path()),
     '--virtual-monitor', '800x600',
+    '--wayland-display', 'get-state-gio',
     get_state_tool.full_path(),
   ],
   suite: ['tools'],
-  env: test_env,
+  env: tools_test_env,
   is_parallel: false,
   timeout: 60,
 )
@@ -448,12 +452,13 @@ test('get-state-tool-gdbus', mutter,
     '--headless',
     '--mutter-plugin=@0@'.format(default_plugin.full_path()),
     '--virtual-monitor', '800x600',
+    '--wayland-display', 'get-state-gdbus',
     '--',
     get_state_tool.full_path(),
     '--gdbus',
   ],
   suite: ['tools'],
-  env: test_env,
+  env: tools_test_env,
   is_parallel: false,
   timeout: 60,
 )