From e5214dd8f1356ac77e9caed5abb2b76deb27a920 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Tue, 12 Nov 2013 17:32:13 +0000 Subject: [PATCH] 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 Signed-off-by: Emil Velikov Reviewed-by: Ian Romanick --- src/glx/tests/query_renderer_implementation_unittest.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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 #include +#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 */ -- 2.30.2