sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

tests: Include 'src/tests' in G_TEST_BUILDDIR

Browse source 
This will help with finding executables in installed tests.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3973>
This commit is contained in:
Jonas Ådahl 2024-08-21 22:05:38 +02:00 committed by Marge Bot
parent 1d724e7e9d
commit 1a0be0232a
5 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tests/input-capture-tests.c
View file

@ -50,8 +50,6 @@ input_capture_test_client_new (const char *test_case)
GDataOutputStream *line_writer; GDataOutputStream *line_writer;
test_client_path = g_test_build_filename (G_TEST_BUILT, test_client_path = g_test_build_filename (G_TEST_BUILT,
"src",
"tests",
"mutter-input-capture-test-client", "mutter-input-capture-test-client",
NULL); NULL);
launcher = g_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE | launcher = g_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE |

2
src/tests/meson.build
View file

@ -142,7 +142,7 @@ test_env = environment()
test_env_variables = { test_env_variables = {
'G_TEST_SRCDIR': mutter_srcdir / 'src', 'G_TEST_SRCDIR': mutter_srcdir / 'src',
'G_TEST_BUILDDIR': mutter_builddir, 'G_TEST_BUILDDIR': mutter_builddir / 'src' / 'tests',
'XDG_CONFIG_HOME': mutter_builddir / '.config', 'XDG_CONFIG_HOME': mutter_builddir / '.config',
'MUTTER_TEST_PLUGIN_PATH': '@0@'.format(default_plugin.full_path()), 'MUTTER_TEST_PLUGIN_PATH': '@0@'.format(default_plugin.full_path()),
'MUTTER_REF_TEST_RESULT_DIR': mutter_builddir / 'meson-logs' / 'tests' / 'ref-tests', 'MUTTER_REF_TEST_RESULT_DIR': mutter_builddir / 'meson-logs' / 'tests' / 'ref-tests',

2
src/tests/meta-wayland-test-utils.c
View file

@ -35,8 +35,6 @@ static char *
get_test_client_path (const char *test_client_name) get_test_client_path (const char *test_client_name)
{ {
return g_test_build_filename (G_TEST_BUILT, return g_test_build_filename (G_TEST_BUILT,
"src",
"tests",
"wayland-test-clients", "wayland-test-clients",
test_client_name, test_client_name,
NULL); NULL);

2
src/tests/native-screen-cast.c
View file

@ -55,8 +55,6 @@ meta_test_screen_cast_record_virtual (void)
meta_add_verbose_topic (META_DEBUG_SCREEN_CAST); meta_add_verbose_topic (META_DEBUG_SCREEN_CAST);
test_client_path = g_test_build_filename (G_TEST_BUILT, test_client_path = g_test_build_filename (G_TEST_BUILT,
"src",
"tests",
"mutter-screen-cast-client", "mutter-screen-cast-client",
NULL); NULL);
g_subprocess_launcher_setenv (launcher, g_subprocess_launcher_setenv (launcher,

2
src/tests/xwayland-tests.c
View file

@ -283,8 +283,6 @@ meta_test_xwayland_compositor_selection (void)
TRUE); TRUE);
x11_compositor_checker = g_test_build_filename (G_TEST_BUILT, x11_compositor_checker = g_test_build_filename (G_TEST_BUILT,
"src",
"tests",
"x11-compositor-checker", "x11-compositor-checker",
NULL); NULL);