From 1a0be0232a84f8617da0327dd132b8c31f784b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 21 Aug 2024 22:05:38 +0200
Subject: [PATCH] tests: Include 'src/tests' in G_TEST_BUILDDIR

This will help with finding executables in installed tests.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3973>
---
 src/tests/input-capture-tests.c     | 2 --
 src/tests/meson.build               | 2 +-
 src/tests/meta-wayland-test-utils.c | 2 --
 src/tests/native-screen-cast.c      | 2 --
 src/tests/xwayland-tests.c          | 2 --
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/tests/input-capture-tests.c b/src/tests/input-capture-tests.c
index 7508ac77e..eb7306f1e 100644
--- a/src/tests/input-capture-tests.c
+++ b/src/tests/input-capture-tests.c
@@ -50,8 +50,6 @@ input_capture_test_client_new (const char *test_case)
   GDataOutputStream *line_writer;
 
   test_client_path = g_test_build_filename (G_TEST_BUILT,
-                                            "src",
-                                            "tests",
                                             "mutter-input-capture-test-client",
                                             NULL);
   launcher = g_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE |
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 728821a11..f1cb3b836 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -142,7 +142,7 @@ test_env = environment()
 
 test_env_variables = {
   'G_TEST_SRCDIR': mutter_srcdir / 'src',
-  'G_TEST_BUILDDIR': mutter_builddir,
+  'G_TEST_BUILDDIR': mutter_builddir / 'src' / 'tests',
   'XDG_CONFIG_HOME': mutter_builddir / '.config',
   'MUTTER_TEST_PLUGIN_PATH': '@0@'.format(default_plugin.full_path()),
   'MUTTER_REF_TEST_RESULT_DIR': mutter_builddir / 'meson-logs' / 'tests' / 'ref-tests',
diff --git a/src/tests/meta-wayland-test-utils.c b/src/tests/meta-wayland-test-utils.c
index 738575cd8..84744bee9 100644
--- a/src/tests/meta-wayland-test-utils.c
+++ b/src/tests/meta-wayland-test-utils.c
@@ -35,8 +35,6 @@ static char *
 get_test_client_path (const char *test_client_name)
 {
   return g_test_build_filename (G_TEST_BUILT,
-                                "src",
-                                "tests",
                                 "wayland-test-clients",
                                 test_client_name,
                                 NULL);
diff --git a/src/tests/native-screen-cast.c b/src/tests/native-screen-cast.c
index 1a3771f65..2b40ba79c 100644
--- a/src/tests/native-screen-cast.c
+++ b/src/tests/native-screen-cast.c
@@ -55,8 +55,6 @@ meta_test_screen_cast_record_virtual (void)
   meta_add_verbose_topic (META_DEBUG_SCREEN_CAST);
 
   test_client_path = g_test_build_filename (G_TEST_BUILT,
-                                            "src",
-                                            "tests",
                                             "mutter-screen-cast-client",
                                             NULL);
   g_subprocess_launcher_setenv (launcher,
diff --git a/src/tests/xwayland-tests.c b/src/tests/xwayland-tests.c
index 5c8c6321b..777d14188 100644
--- a/src/tests/xwayland-tests.c
+++ b/src/tests/xwayland-tests.c
@@ -283,8 +283,6 @@ meta_test_xwayland_compositor_selection (void)
                                 TRUE);
 
   x11_compositor_checker = g_test_build_filename (G_TEST_BUILT,
-                                                  "src",
-                                                  "tests",
                                                   "x11-compositor-checker",
                                                   NULL);