summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2013-11-12 17:32:13 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2014-03-11 12:50:43 +0000
commite5214dd8f1356ac77e9caed5abb2b76deb27a920 (patch)
treefa814a4b4f7a158548dccb2728af5ac5f61e068f /src
parent254aafba3e1c4a50dc79c6cfe2ad9b48152267c0 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/glx/tests/query_renderer_implementation_unittest.cpp4
1 files changed, 4 insertions, 0 deletions
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 */