[mutter] tests: Ensure tests run in a nested mutter



commit 2d65b485fd226b5375b5982904c42e8620ab71fd
Author: Jonas Ådahl <jadahl gmail com>
Date:   Sat Mar 5 14:17:00 2016 +0800

    tests: Ensure tests run in a nested mutter
    
    Since mutter was changed to be D-Bus activatable, the test cases has not
    been working when running from inside a GNOME Wayland session. This
    commit makes the test work again by ensuring the tests run in a nested
    mutter instance.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763125

 src/tests/test-runner.c |    4 ++--
 src/tests/unit-tests.c  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c
index 4f1f446..0e6f3f4 100644
--- a/src/tests/test-runner.c
+++ b/src/tests/test-runner.c
@@ -1136,10 +1136,10 @@ main (int argc, char **argv)
 
   /* Then initalize mutter with a different set of arguments */
 
-  char *fake_args[] = { NULL, (char *)"--wayland" };
+  char *fake_args[] = { NULL, (char *)"--wayland", (char *)"--nested" };
   fake_args[0] = argv[0];
   char **fake_argv = fake_args;
-  int fake_argc = 2;
+  int fake_argc = G_N_ELEMENTS (fake_args);
 
   char *basename = g_path_get_basename (argv[0]);
   char *dirname = g_path_get_dirname (argv[0]);
diff --git a/src/tests/unit-tests.c b/src/tests/unit-tests.c
index a3bdb4e..019b6d5 100644
--- a/src/tests/unit-tests.c
+++ b/src/tests/unit-tests.c
@@ -213,10 +213,10 @@ main (int argc, char *argv[])
 
   g_option_context_free (ctx);
 
-  char *fake_args[] = { NULL, "--wayland" };
+  char *fake_args[] = { NULL, "--wayland", "--nested" };
   fake_args[0] = argv[0];
   char **fake_argv = fake_args;
-  int fake_argc = 2;
+  int fake_argc = G_N_ELEMENTS (fake_args);
 
   ctx = meta_get_option_context ();
   if (!g_option_context_parse (ctx, &fake_argc, &fake_argv, &error))


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