[Piglit] [PATCH 07/18] cmake: If USE_WAFFLE, disable tests that use quirky GLUT functions [v2]

[Chad Versace]

If USE_WAFFLE is enabled, do not build the tests below.  The tests use
quirky use GLUT functions that will not be implemented in Waffle.
    fbo-depth-sample-compare: Uses glutSolidSphere.
    windowoverlap: Uses glutCreateSubWindow.
    texwrap: Uses glutBitmapCharacter.
    texture-pakced-formats: Uses glutBitmapCharacter.

Eventually, these tests need to be repaired so that they no longer require
the quirky GLUT functions.  However, the Waffle integration shouldn't be
blocked by this small set of tests. Work on reparing these tests can
proceed in tandem with the Waffle integration.

v2: Fix indentation.

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/fbo/CMakeLists.gl.txt       |    6 +++++-
 tests/general/CMakeLists.gl.txt   |    6 +++++-
 tests/texturing/CMakeLists.gl.txt |   10 +++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt
index 8e120e7..7025019 100644
--- a/tests/fbo/CMakeLists.gl.txt
+++ b/tests/fbo/CMakeLists.gl.txt
@@ -11,6 +11,11 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
+if(NOT USE_WAFFLE)
+	# This test uses glutSolidSphere.
+	piglit_add_executable (fbo-depth-sample-compare fbo-depth-sample-compare.c)
+endif(NOT USE_WAFFLE)
+
 piglit_add_executable (fbo-1d fbo-1d.c)
 piglit_add_executable (fbo-alphatest-formats fbo-alphatest-formats.c)
 piglit_add_executable (fbo-alphatest-nocolor fbo-alphatest-nocolor.c)
@@ -18,7 +23,6 @@ piglit_add_executable (fbo-alphatest-nocolor-ff fbo-alphatest-nocolor-ff.c)
 piglit_add_executable (fbo-depth fbo-depth.c)
 piglit_add_executable (fbo-depth-tex1d fbo-depth-tex1d.c)
 piglit_add_executable (fbo-depthstencil fbo-depthstencil.c)
-piglit_add_executable (fbo-depth-sample-compare fbo-depth-sample-compare.c)
 piglit_add_executable (fbo-depthtex fbo-depthtex.c)
 piglit_add_executable (fbo-3d fbo-3d.c)
 piglit_add_executable (fbo-array fbo-array.c)
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
index 49e15ba..b2213c4 100644
--- a/tests/general/CMakeLists.gl.txt
+++ b/tests/general/CMakeLists.gl.txt
@@ -10,6 +10,11 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
+if(NOT USE_WAFFLE)
+	# This test uses glutCreateSubWindow.
+	piglit_add_executable (windowoverlap windowoverlap.c)
+endif(NOT USE_WAFFLE)
+
 piglit_add_executable (array-stride array-stride.c)
 piglit_add_executable (bgra-vert-attrib-pointer bgra-vert-attrib-pointer.c)
 piglit_add_executable (bgra-sec-color-pointer bgra-sec-color-pointer.c)
@@ -119,7 +124,6 @@ piglit_add_executable (vbo-map-remap vbo-map-remap.c)
 piglit_add_executable (vbo-bufferdata vbo-bufferdata.c)
 piglit_add_executable (vbo-subdata-zero vbo-subdata-zero.c)
 piglit_add_executable (vbo-subdata-sync vbo-subdata-sync.c)
-piglit_add_executable (windowoverlap windowoverlap.c)
 piglit_add_executable (object_purgeable-api-pbo object_purgeable-api-pbo.c object_purgeable.c)
 piglit_add_executable (object_purgeable-api-texture object_purgeable-api-texture.c object_purgeable.c)
 piglit_add_executable (object_purgeable-api-vbo object_purgeable-api-vbo.c object_purgeable.c)
diff --git a/tests/texturing/CMakeLists.gl.txt b/tests/texturing/CMakeLists.gl.txt
index f4ad8bc..47f294b 100644
--- a/tests/texturing/CMakeLists.gl.txt
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -10,6 +10,13 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
+if(NOT USE_WAFFLE)
+	# These tests use glutBitmapCharacter.
+	piglit_add_executable (getteximage-formats getteximage-formats.c)
+	piglit_add_executable (texture-packed-formats texture-packed-formats.c)
+	piglit_add_executable (texwrap texwrap.c)
+endif(NOT USE_WAFFLE)
+
 piglit_add_executable (1-1-linear-texture 1-1-linear-texture.c)
 piglit_add_executable (array-texture array-texture.c)
 piglit_add_executable (compressedteximage compressedteximage.c)
@@ -28,7 +35,6 @@ piglit_add_executable (gen-nonzero-unit gen-nonzero-unit.c)
 piglit_add_executable (gen-teximage gen-teximage.c)
 piglit_add_executable (gen-texsubimage gen-texsubimage.c)
 piglit_add_executable (getteximage-simple getteximage-simple.c)
-piglit_add_executable (getteximage-formats getteximage-formats.c)
 piglit_add_executable (getteximage-luminance getteximage-luminance.c)
 piglit_add_executable (incomplete-texture incomplete-texture.c)
 piglit_add_executable (fragment-and-vertex-texturing fragment-and-vertex-texturing.c)
@@ -63,7 +69,6 @@ piglit_add_executable (texdepth texdepth.c)
 piglit_add_executable (teximage-errors teximage-errors.c)
 piglit_add_executable (texrect-many texrect-many.c)
 piglit_add_executable (texredefine texredefine.c)
-piglit_add_executable (texture-packed-formats texture-packed-formats.c)
 piglit_add_executable (texture-integer texture-integer.c)
 piglit_add_executable (depth-tex-modes      depth-tex-modes.c depth-tex-modes-common.c)
 piglit_add_executable (depth-tex-modes-rg   depth-tex-modes-rg.c depth-tex-modes-common.c)
@@ -81,6 +86,5 @@ ENDIF (UNIX)
 piglit_add_executable (texsubimage texsubimage.c)
 piglit_add_executable (texture-al texture-al.c)
 piglit_add_executable (texture-rg texture-rg.c)
-piglit_add_executable (texwrap texwrap.c)
 
 # vim: ft=cmake:
-- 
1.7.10.1