[clutter/clutter-1.14] conformance: Only check for DISPLAY on X11 windowing backend

[Emmanuele Bassi <ebassi src gnome org>]

commit 85bc8effa5431975a89cca368e5eaee7a0c3a880
Author: Rob Bradford <rob linux intel com>
Date:   Fri Feb 15 18:06:50 2013 +0000

    conformance: Only check for DISPLAY on X11 windowing backend
    
    Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=693741

 tests/conform/test-conform-common.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/tests/conform/test-conform-common.c b/tests/conform/test-conform-common.c
index 4d400e3..881a6b1 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)