diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2012-06-20 08:50:48 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2012-06-20 08:50:48 +0100 |
| commit | a9847496a840f858b50259e56773667636c378c9 (patch) | |
| tree | d8b7a4b2d045286503e1b75febb48300b4030e06 | |
| parent | 25b67e96c89644cfe9a2735730d4648c16730d21 (diff) | |
| download | clutter-a9847496a840f858b50259e56773667636c378c9.tar.gz | |
conform: Put xinput enabling under guards
Calling clutter_x11_* API should be done only under the platform
specific guards we provide with Clutter.
https://bugzilla.gnome.org/show_bug.cgi?id=678423
| -rw-r--r-- | tests/conform/test-conform-common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/conform/test-conform-common.c b/tests/conform/test-conform-common.c index 2a8016639..09474bcdb 100644 --- a/tests/conform/test-conform-common.c +++ b/tests/conform/test-conform-common.c @@ -31,7 +31,7 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture, "$ make test-report"); counter++; -#ifdef HAVE_CLUTTER_GLX +#ifdef CLUTTER_WINDOWING_X11 { /* on X11 we need a display connection to run the test suite */ const gchar *display = g_getenv ("DISPLAY"); @@ -43,9 +43,10 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture, exit (EXIT_SUCCESS); } } -#endif + /* enable XInput support */ clutter_x11_enable_xinput (); +#endif g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr) == CLUTTER_INIT_SUCCESS); |