[mutter] tests: Use custom Wayland display name



commit 95c101a0ba3a86e97ebc817fddf9c5d4d620c780
Author: Jonas Ådahl <jadahl gmail com>
Date:   Mon Dec 5 21:26:46 2016 +0800

    tests: Use custom Wayland display name
    
    This gets rid of a warning about the Wayland display name already being
    taken.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=777732

 src/tests/test-runner.c |    1 +
 src/tests/unit-tests.c  |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
index 0e6f3f4..56ad43f 100644
--- a/src/tests/test-runner.c
+++ b/src/tests/test-runner.c
@@ -1159,6 +1159,7 @@ main (int argc, char **argv)
   g_option_context_free (ctx);
 
   meta_plugin_manager_load ("default");
+  meta_wayland_override_display_name ("mutter-test-display");
 
   meta_init ();
   meta_register_with_session ();
diff --git a/src/tests/unit-tests.c b/src/tests/unit-tests.c
index 8f7f83f..4f2856b 100644
--- a/src/tests/unit-tests.c
+++ b/src/tests/unit-tests.c
@@ -29,6 +29,7 @@
 #include "core/main-private.h"
 #include "tests/meta-backend-test.h"
 #include "tests/monitor-unit-tests.h"
+#include "wayland/meta-wayland.h"
 
 typedef struct _MetaTestLaterOrderCallbackData
 {
@@ -224,6 +225,7 @@ main (int argc, char *argv[])
 
   meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND,
                                           META_TYPE_BACKEND_TEST);
+  meta_wayland_override_display_name ("mutter-test-display");
 
   meta_init ();
   meta_register_with_session ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]