From 6d992e9e4570067f38e62a548261361bcff90a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 24 May 2023 14:39:55 +0200
Subject: [PATCH] tests: Perform x11 test in both sync and async modes

The former allows better catching of issues, so do both cases

See: https://gitlab.gnome.org/GNOME/mutter/-/issues/2835
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3020>
---
 src/tests/meson.build | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/tests/meson.build b/src/tests/meson.build
index 16c77b7bd..529559e18 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -666,18 +666,29 @@ if have_kvm_tests or have_tty_tests
 endif
 
 if have_x11
-  test('x11', xvfb,
-    args: [
-      xvfb_args,
-      find_program('x11-test.sh').full_path(),
-      mutter.full_path(),
-    ],
-    depends: [mutter],
-    suite: ['core', 'mutter/x11'],
-    env: test_env,
-    is_parallel: false,
-    timeout: 60,
-  )
+  foreach mode: ['', 'sync']
+    x11_env = test_env
+    if mode == 'sync'
+      x11_env.set('MUTTER_SYNC', '1')
+    endif
+    test('x11' + (mode != '' ? '-' + mode : ''), xvfb,
+      args: [
+        xvfb_args,
+        find_program('x11-test.sh').full_path(),
+        mutter.full_path(),
+      ],
+      depends: [
+        mutter,
+        default_plugin,
+        x11_frames,
+      ],
+      env: x11_env,
+      suite: ['core', 'mutter/x11'],
+      should_fail: mode == 'sync',
+      is_parallel: false,
+      timeout: 60,
+    )
+  endforeach
 endif
 
 tools_test_env = test_env