isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Don't initialize Clutter

Browse Source 
Clutter's backend code depends on MetaBackend now, which makes it
impossible to initialize without resorting to private mutter API.

Luckily we only need Clutter for interactive tests which are broken
anyway, as Clutter.main() and friends were removed a while ago.

So for now, get at least unit tests working again by simply the
unnecessary Clutter initialization.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/691
This commit is contained in:
Florian Müllner 2019-08-25 10:39:04 +03:00
parent c27bd62106
commit 8ac5be95d3
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/run-js-test.c
View File

@ -30,11 +30,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <clutter/x11/clutter-x11.h>
#include <gdk/gdkx.h>
#include <girepository.h> #include <girepository.h>
#include <gjs/gjs.h> #include <gjs/gjs.h>
#include <gtk/gtk.h>
#include "shell-global.h" #include "shell-global.h"
#include "shell-global-private.h" #include "shell-global-private.h"
@ -59,17 +56,6 @@ main(int argc, char **argv)
gsize len; gsize len;
int code; int code;
gdk_set_allowed_backends("x11");
gtk_init (&argc, &argv);
clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
return 1;
gdk_x11_display_set_window_scale (gdk_display_get_default (), 1);
context = g_option_context_new (NULL); context = g_option_context_new (NULL);
/* pass unknown through to the JS script */ /* pass unknown through to the JS script */