diff options
| author | Rob Bradford <rob@linux.intel.com> | 2013-02-15 18:06:50 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-02-20 23:06:28 +0000 |
| commit | 6bef2cff1984ff9b058864d0fc49a8cb108abefd (patch) | |
| tree | f4456063f953e233976414c8eaa57420fa8f38b4 | |
| parent | e4598a9e527174fbbdee7341381a681b48ac762f (diff) | |
| download | clutter-6bef2cff1984ff9b058864d0fc49a8cb108abefd.tar.gz | |
conformance: Only check for DISPLAY on X11 windowing backend
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=693741
| -rw-r--r-- | tests/conform/test-conform-common.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/conform/test-conform-common.c b/tests/conform/test-conform-common.c index 4d400e35f..881a6b1cd 100644 --- a/tests/conform/test-conform-common.c +++ b/tests/conform/test-conform-common.c @@ -32,20 +32,21 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture, counter++; #ifdef CLUTTER_WINDOWING_X11 - { - /* on X11 we need a display connection to run the test suite */ - 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"); + 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"); + if (!display || *display == '\0') + { + 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 */ clutter_x11_enable_xinput (); - } + } #endif g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr) |