brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conformance: Only check for DISPLAY on X11 windowing backend

Browse Source 
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=693741
This commit is contained in:
Rob Bradford 2013-02-15 18:06:50 +00:00 committed by Emmanuele Bassi
parent e4598a9e52
commit 6bef2cff19
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/conform/test-conform-common.c
View File

@ -32,20 +32,21 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture,
counter++; counter++;
#ifdef CLUTTER_WINDOWING_X11 #ifdef CLUTTER_WINDOWING_X11
{ if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
/* on X11 we need a display connection to run the test suite */ {
const gchar *display = g_getenv ("DISPLAY"); /* on X11 we need a display connection to run the test suite */
if (!display || *display == '\0') const gchar *display = g_getenv ("DISPLAY");
{ if (!display || *display == '\0')
g_print ("No DISPLAY found. Unable to run the conformance " {
"test suite without a display.\n"); g_print ("No DISPLAY found. Unable to run the conformance "
"test suite without a display.\n");
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);
} }
/* enable XInput support */ /* enable XInput support */
clutter_x11_enable_xinput (); clutter_x11_enable_xinput ();
} }
#endif #endif
g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr) g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr)