From: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue, 12 Nov 2013 17:32:13 +0000 (+0000)
Subject: glx/tests: honor enable-driglx-direct configure flag
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5214dd8f1356ac77e9caed5abb2b76deb27a920;p=mesa.git

glx/tests: honor enable-driglx-direct configure flag

Recent commit fixed build issues in dri2_query_renderer.c by
wrapping in defined(direct_rendering) && !defined(applegl)

This patch targets the query_renderer tests, so that make check
passes on platforms such as hurd and cygwin.

v2: (Emil)
 - Rebase and update commit message.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp
index 474908939d6..2bf88430263 100644
--- a/src/glx/tests/query_renderer_implementation_unittest.cpp
+++ b/src/glx/tests/query_renderer_implementation_unittest.cpp
@@ -24,6 +24,8 @@
 #include <signal.h>
 #include <setjmp.h>
 
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+
 extern "C" {
 #include "glxclient.h"
 #include "glx_error.h"
@@ -308,3 +310,5 @@ TEST_F(dri2_query_renderer_integer_test, valid_attribute_mapping)
       EXPECT_FALSE(got_sigsegv);
    }
 }
+
+#endif /* GLX_DIRECT_RENDERING */