mirror of
https://github.com/brl/mutter.git
synced 2024-11-12 17:27:03 -05:00
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
This commit is contained in:
parent
613cadd19b
commit
2d65b485fd
@ -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]);
|
||||
|
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user