isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests: Override Wayland display name in test_init()

Browse Source 
It's overridden by all test cases, but they all also call test_init() so
do it there instead.

https://gitlab.gnome.org/GNOME/mutter/issues/193
This commit is contained in:
Jonas Ådahl 2018-11-12 11:28:56 +01:00
parent e2cd9abf46
commit fe1d9fb4a7
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tests/headless-start-test.c
View File

@ -189,7 +189,6 @@ main (int argc, char *argv[])
meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND, meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND,
META_TYPE_BACKEND_TEST); META_TYPE_BACKEND_TEST);
meta_wayland_override_display_name ("mutter-test-display");
meta_init (); meta_init ();
meta_register_with_session (); meta_register_with_session ();

1
src/tests/test-runner.c
View File

@ -797,7 +797,6 @@ main (int argc, char **argv)
g_option_context_free (ctx); g_option_context_free (ctx);
meta_plugin_manager_load (test_get_plugin_name ()); meta_plugin_manager_load (test_get_plugin_name ());
meta_wayland_override_display_name ("mutter-test-display");
meta_init (); meta_init ();
meta_register_with_session (); meta_register_with_session ();

2
src/tests/test-utils.c
View File

@ -92,6 +92,8 @@ test_init (int *argc,
g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id="); g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=");
ensure_test_client_path (*argc, *argv); ensure_test_client_path (*argc, *argv);
meta_wayland_override_display_name ("mutter-test-display");
} }
AsyncWaiter * AsyncWaiter *

1
src/tests/unit-tests.c
View File

@ -263,7 +263,6 @@ main (int argc, char *argv[])
meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND, meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND,
META_TYPE_BACKEND_TEST); META_TYPE_BACKEND_TEST);
meta_wayland_override_display_name ("mutter-test-display");
meta_init (); meta_init ();
meta_register_with_session (); meta_register_with_session ();