cmake: Replace calls to add_{executable,library} with wrappers

Replace
    add_executable -> piglit_add_executable
    add_library -> piglit_add_library

For now, each wrapper function trivially wraps the function it replaces,
and so this patch changes no behavior.

This commit was created using the command:

   sed -i -e "s/add_executable/piglit_add_executable/" -e "s/add_library/piglit_add_library/" $(find src/ tests/ -name "*CMakeLists*")

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

76 files changed, 649 insertions, 649 deletions

diff --git a/src/glut_egl/CMakeLists.no_api.txt b/src/glut_egl/CMakeLists.no_api.txt
index f0597435a..90773c4ff 100644
--- a/src/glut_egl/CMakeLists.no_api.txt
+++ b/src/glut_egl/CMakeLists.no_api.txt
@@ -6,7 +6,7 @@ include_directories(
 link_libraries(${OPENGL_egl_LIBRARY})
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	add_library (glut_egl
+	piglit_add_library (glut_egl
 		    glut_egl.c
 		    glut_egl_x11.c
 	)
diff --git a/tests/asmparsertest/CMakeLists.gl.txt b/tests/asmparsertest/CMakeLists.gl.txt
index 9ad43c56a..ee74560bd 100644
--- a/tests/asmparsertest/CMakeLists.gl.txt
+++ b/tests/asmparsertest/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (asmparsertest asmparsertest.c)
+piglit_add_executable (asmparsertest asmparsertest.c)
 
 # vim: ft=cmake:
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index df621f216..50f0715bb 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -13,25 +13,25 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (crash-cubemap-order crash-cubemap-order.c)
-add_executable (crash-texparameter-before-teximage crash-texparameter-before-teximage.c)
-add_executable (drawbuffer-modes drawbuffer-modes.c)
-add_executable (fdo9833 fdo9833.c)
-add_executable (fdo10370 fdo10370.c)
-add_executable (fdo14575 fdo14575.c)
-add_executable (r300-readcache r300-readcache.c)
-add_executable (tex1d-2dborder tex1d-2dborder.c)
-add_executable (fdo20701 fdo20701.c)
-add_executable (point-sprite point-sprite.c)
-add_executable (fdo22540 fdo22540.c)
-add_executable (fdo23489 fdo23489.c)
-add_executable (fdo23670-depth_test fdo23670-depth_test.c)
-add_executable (fdo23670-drawpix_stencil fdo23670-drawpix_stencil.c)
-add_executable (fdo24066 fdo24066.c)
-add_executable (fdo25614-genmipmap fdo25614-genmipmap.c)
-add_executable (fdo28551 fdo28551.c)
-add_executable (fdo31934 fdo31934.c)
-add_executable (tri-tex-crash tri-tex-crash.c)
-add_executable (vbo-buffer-unmap vbo-buffer-unmap.c)
+piglit_add_executable (crash-cubemap-order crash-cubemap-order.c)
+piglit_add_executable (crash-texparameter-before-teximage crash-texparameter-before-teximage.c)
+piglit_add_executable (drawbuffer-modes drawbuffer-modes.c)
+piglit_add_executable (fdo9833 fdo9833.c)
+piglit_add_executable (fdo10370 fdo10370.c)
+piglit_add_executable (fdo14575 fdo14575.c)
+piglit_add_executable (r300-readcache r300-readcache.c)
+piglit_add_executable (tex1d-2dborder tex1d-2dborder.c)
+piglit_add_executable (fdo20701 fdo20701.c)
+piglit_add_executable (point-sprite point-sprite.c)
+piglit_add_executable (fdo22540 fdo22540.c)
+piglit_add_executable (fdo23489 fdo23489.c)
+piglit_add_executable (fdo23670-depth_test fdo23670-depth_test.c)
+piglit_add_executable (fdo23670-drawpix_stencil fdo23670-drawpix_stencil.c)
+piglit_add_executable (fdo24066 fdo24066.c)
+piglit_add_executable (fdo25614-genmipmap fdo25614-genmipmap.c)
+piglit_add_executable (fdo28551 fdo28551.c)
+piglit_add_executable (fdo31934 fdo31934.c)
+piglit_add_executable (tri-tex-crash tri-tex-crash.c)
+piglit_add_executable (vbo-buffer-unmap vbo-buffer-unmap.c)
 
 # vim: ft=cmake:
diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
index 32591a909..aa863b0cd 100644
--- a/tests/egl/CMakeLists.gl.txt
+++ b/tests/egl/CMakeLists.gl.txt
@@ -14,13 +14,13 @@ link_libraries (
 )
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	add_executable (egl-nok-swap-region egl-util.c egl-nok-swap-region.c)
+	piglit_add_executable (egl-nok-swap-region egl-util.c egl-nok-swap-region.c)
 	target_link_libraries(egl-nok-swap-region pthread ${X11_X11_LIB})
-	add_executable (egl-nok-texture-from-pixmap egl-util.c egl-nok-texture-from-pixmap.c)
+	piglit_add_executable (egl-nok-texture-from-pixmap egl-util.c egl-nok-texture-from-pixmap.c)
 	target_link_libraries(egl-nok-texture-from-pixmap pthread ${X11_X11_LIB})
-	add_executable (egl-create-surface egl-util.c egl-create-surface.c)
+	piglit_add_executable (egl-create-surface egl-util.c egl-create-surface.c)
 	target_link_libraries(egl-create-surface pthread ${X11_X11_LIB})
-	add_executable (egl-query-surface egl-util.c egl-query-surface.c)
+	piglit_add_executable (egl-query-surface egl-util.c egl-query-surface.c)
 	target_link_libraries(egl-query-surface pthread ${X11_X11_LIB})
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt
index 44015a1c4..579e623da 100644
--- a/tests/fbo/CMakeLists.gl.txt
+++ b/tests/fbo/CMakeLists.gl.txt
@@ -13,78 +13,78 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (fbo-1d fbo-1d.c)
-add_executable (fbo-alphatest-formats fbo-alphatest-formats.c)
-add_executable (fbo-alphatest-nocolor fbo-alphatest-nocolor.c)
-add_executable (fbo-alphatest-nocolor-ff fbo-alphatest-nocolor-ff.c)
-add_executable (fbo-depth fbo-depth.c)
-add_executable (fbo-depth-tex1d fbo-depth-tex1d.c)
-add_executable (fbo-depthstencil fbo-depthstencil.c)
-add_executable (fbo-depth-sample-compare fbo-depth-sample-compare.c)
-add_executable (fbo-depthtex fbo-depthtex.c)
-add_executable (fbo-3d fbo-3d.c)
-add_executable (fbo-array fbo-array.c)
-add_executable (fbo-depth-array fbo-depth-array.c)
-add_executable (fbo-alpha fbo-alpha.c)
-add_executable (fbo-luminance-alpha fbo-luminance-alpha.c)
-add_executable (fbo-bind-renderbuffer fbo-bind-renderbuffer.c)
-add_executable (fbo-blit fbo-blit.c)
-add_executable (fbo-blit-d24s8 fbo-blit-d24s8.c)
-add_executable (fbo-blending-formats fbo-blending-formats.c)
-add_executable (fbo-copypix fbo-copypix.c)
-add_executable (fbo-readdrawpix fbo-readdrawpix.c)
-add_executable (fbo-clearmipmap fbo-clearmipmap.c)
-add_executable (fbo-clear-formats fbo-clear-formats.c)
-add_executable (fbo-drawbuffers fbo-drawbuffers.c)
-add_executable (fbo-drawbuffers-arbfp fbo-drawbuffers-arbfp.c)
-add_executable (fbo-drawbuffers-blend-add fbo-drawbuffers-blend-add.c)
-add_executable (fbo-drawbuffers-fragcolor fbo-drawbuffers-fragcolor.c)
-add_executable (fbo-drawbuffers-maxtargets fbo-drawbuffers-maxtargets.c)
-add_executable (fbo-drawbuffers2-blend fbo-drawbuffers2-blend.c)
-add_executable (fbo-drawbuffers2-colormask fbo-drawbuffers2-colormask.c)
-add_executable (fbo-draw-buffers-blend fbo-draw-buffers-blend.c)
-add_executable (fbo-finish-deleted fbo-finish-deleted.c)
-add_executable (fbo-flushing fbo-flushing.c)
-add_executable (fbo-flushing-2 fbo-flushing-2.c)
-add_executable (fbo-fragcoord fbo-fragcoord.c)
-add_executable (fbo-fragcoord2 fbo-fragcoord2.c)
-add_executable (fbo-generatemipmap fbo-generatemipmap.c)
-add_executable (fbo-generatemipmap-array fbo-generatemipmap-array.c)
-add_executable (fbo-generatemipmap-filtering fbo-generatemipmap-filtering.c)
-add_executable (fbo-generatemipmap-formats fbo-generatemipmap-formats.c)
-add_executable (fbo-generatemipmap-scissor fbo-generatemipmap-scissor.c)
-add_executable (fbo-generatemipmap-noimage fbo-generatemipmap-noimage.c)
-add_executable (fbo-generatemipmap-nonsquare fbo-generatemipmap-nonsquare.c)
-add_executable (fbo-generatemipmap-npot fbo-generatemipmap-npot.c)
-add_executable (fbo-generatemipmap-viewport fbo-generatemipmap-viewport.c)
-add_executable (fbo-getframebufferattachmentparameter-01 fbo-getframebufferattachmentparameter-01.c)
-add_executable (fbo-gl_pointcoord fbo-gl_pointcoord.c)
-add_executable (fbo-incomplete-texture-01 fbo-incomplete-texture-01.c)
-add_executable (fbo-incomplete-texture-02 fbo-incomplete-texture-02.c)
-add_executable (fbo-incomplete-texture-03 fbo-incomplete-texture-03.c)
-add_executable (fbo-incomplete-texture-04 fbo-incomplete-texture-04.c)
-add_executable (fbo-integer fbo-integer.c)
-add_executable (fbo-maxsize fbo-maxsize.c)
-add_executable (fbo-mipmap-copypix fbo-mipmap-copypix.c)
-add_executable (fbo-nodepth-test fbo-nodepth-test.c)
-add_executable (fbo-nostencil-test fbo-nostencil-test.c)
-add_executable (fbo-readpixels fbo-readpixels.c)
-add_executable (fbo-readpixels-depth-formats fbo-readpixels-depth-formats.c)
-add_executable (fbo-rg fbo-rg.c)
-add_executable (fbo-srgb fbo-srgb.c)
-add_executable (fbo-srgb-blit fbo-srgb-blit.c)
+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)
+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)
+piglit_add_executable (fbo-depth-array fbo-depth-array.c)
+piglit_add_executable (fbo-alpha fbo-alpha.c)
+piglit_add_executable (fbo-luminance-alpha fbo-luminance-alpha.c)
+piglit_add_executable (fbo-bind-renderbuffer fbo-bind-renderbuffer.c)
+piglit_add_executable (fbo-blit fbo-blit.c)
+piglit_add_executable (fbo-blit-d24s8 fbo-blit-d24s8.c)
+piglit_add_executable (fbo-blending-formats fbo-blending-formats.c)
+piglit_add_executable (fbo-copypix fbo-copypix.c)
+piglit_add_executable (fbo-readdrawpix fbo-readdrawpix.c)
+piglit_add_executable (fbo-clearmipmap fbo-clearmipmap.c)
+piglit_add_executable (fbo-clear-formats fbo-clear-formats.c)
+piglit_add_executable (fbo-drawbuffers fbo-drawbuffers.c)
+piglit_add_executable (fbo-drawbuffers-arbfp fbo-drawbuffers-arbfp.c)
+piglit_add_executable (fbo-drawbuffers-blend-add fbo-drawbuffers-blend-add.c)
+piglit_add_executable (fbo-drawbuffers-fragcolor fbo-drawbuffers-fragcolor.c)
+piglit_add_executable (fbo-drawbuffers-maxtargets fbo-drawbuffers-maxtargets.c)
+piglit_add_executable (fbo-drawbuffers2-blend fbo-drawbuffers2-blend.c)
+piglit_add_executable (fbo-drawbuffers2-colormask fbo-drawbuffers2-colormask.c)
+piglit_add_executable (fbo-draw-buffers-blend fbo-draw-buffers-blend.c)
+piglit_add_executable (fbo-finish-deleted fbo-finish-deleted.c)
+piglit_add_executable (fbo-flushing fbo-flushing.c)
+piglit_add_executable (fbo-flushing-2 fbo-flushing-2.c)
+piglit_add_executable (fbo-fragcoord fbo-fragcoord.c)
+piglit_add_executable (fbo-fragcoord2 fbo-fragcoord2.c)
+piglit_add_executable (fbo-generatemipmap fbo-generatemipmap.c)
+piglit_add_executable (fbo-generatemipmap-array fbo-generatemipmap-array.c)
+piglit_add_executable (fbo-generatemipmap-filtering fbo-generatemipmap-filtering.c)
+piglit_add_executable (fbo-generatemipmap-formats fbo-generatemipmap-formats.c)
+piglit_add_executable (fbo-generatemipmap-scissor fbo-generatemipmap-scissor.c)
+piglit_add_executable (fbo-generatemipmap-noimage fbo-generatemipmap-noimage.c)
+piglit_add_executable (fbo-generatemipmap-nonsquare fbo-generatemipmap-nonsquare.c)
+piglit_add_executable (fbo-generatemipmap-npot fbo-generatemipmap-npot.c)
+piglit_add_executable (fbo-generatemipmap-viewport fbo-generatemipmap-viewport.c)
+piglit_add_executable (fbo-getframebufferattachmentparameter-01 fbo-getframebufferattachmentparameter-01.c)
+piglit_add_executable (fbo-gl_pointcoord fbo-gl_pointcoord.c)
+piglit_add_executable (fbo-incomplete-texture-01 fbo-incomplete-texture-01.c)
+piglit_add_executable (fbo-incomplete-texture-02 fbo-incomplete-texture-02.c)
+piglit_add_executable (fbo-incomplete-texture-03 fbo-incomplete-texture-03.c)
+piglit_add_executable (fbo-incomplete-texture-04 fbo-incomplete-texture-04.c)
+piglit_add_executable (fbo-integer fbo-integer.c)
+piglit_add_executable (fbo-maxsize fbo-maxsize.c)
+piglit_add_executable (fbo-mipmap-copypix fbo-mipmap-copypix.c)
+piglit_add_executable (fbo-nodepth-test fbo-nodepth-test.c)
+piglit_add_executable (fbo-nostencil-test fbo-nostencil-test.c)
+piglit_add_executable (fbo-readpixels fbo-readpixels.c)
+piglit_add_executable (fbo-readpixels-depth-formats fbo-readpixels-depth-formats.c)
+piglit_add_executable (fbo-rg fbo-rg.c)
+piglit_add_executable (fbo-srgb fbo-srgb.c)
+piglit_add_executable (fbo-srgb-blit fbo-srgb-blit.c)
 IF (UNIX)
 	target_link_libraries (fbo-srgb m)
 ENDIF (UNIX)
-add_executable (fbo-stencil fbo-stencil.c)
-add_executable (fbo-storage-formats fbo-storage-formats.c)
-add_executable (fbo-storage-completeness fbo-storage-completeness.c)
-add_executable (fbo-sys-blit fbo-sys-blit.c)
-add_executable (fbo-sys-sub-blit fbo-sys-sub-blit.c)
-add_executable (fbo-pbo-readpixels-small fbo-pbo-readpixels-small.c)
-add_executable (fbo-copyteximage fbo-copyteximage.c)
-add_executable (fbo-copyteximage-simple fbo-copyteximage-simple.c)
-add_executable (fbo-cubemap fbo-cubemap.c)
-add_executable (fbo-scissor-bitmap fbo-scissor-bitmap.c)
+piglit_add_executable (fbo-stencil fbo-stencil.c)
+piglit_add_executable (fbo-storage-formats fbo-storage-formats.c)
+piglit_add_executable (fbo-storage-completeness fbo-storage-completeness.c)
+piglit_add_executable (fbo-sys-blit fbo-sys-blit.c)
+piglit_add_executable (fbo-sys-sub-blit fbo-sys-sub-blit.c)
+piglit_add_executable (fbo-pbo-readpixels-small fbo-pbo-readpixels-small.c)
+piglit_add_executable (fbo-copyteximage fbo-copyteximage.c)
+piglit_add_executable (fbo-copyteximage-simple fbo-copyteximage-simple.c)
+piglit_add_executable (fbo-cubemap fbo-cubemap.c)
+piglit_add_executable (fbo-scissor-bitmap fbo-scissor-bitmap.c)
 
 # vim: ft=cmake:
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
index 95f8819cc..8c5760173 100644
--- a/tests/general/CMakeLists.gl.txt
+++ b/tests/general/CMakeLists.gl.txt
@@ -12,118 +12,118 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (array-stride array-stride.c)
-add_executable (bgra-vert-attrib-pointer bgra-vert-attrib-pointer.c)
-add_executable (bgra-sec-color-pointer bgra-sec-color-pointer.c)
-add_executable (blendminmax blendminmax.c)
-add_executable (blendsquare blendsquare.c)
-add_executable (clear-varray-2.0 clear-varray-2.0.c)
-add_executable (copypixels-sync copypixels-sync.c)
-add_executable (copypixels-draw-sync copypixels-draw-sync.c)
-add_executable (depth-clamp-range depth-clamp-range.c)
-add_executable (dlist-clear dlist-clear.c)
-add_executable (dlist-fdo3129-01 dlist-fdo3129-01.c)
-add_executable (dlist-fdo3129-02 dlist-fdo3129-02.c)
-add_executable (dlist-fdo31590 dlist-fdo31590.c)
-add_executable (depth_clamp depth_clamp.c)
-add_executable (depthfunc depthfunc.c)
-add_executable (depthrange-clear depthrange-clear.c)
-add_executable (draw-arrays-colormaterial draw-arrays-colormaterial.c)
-add_executable (draw-batch draw-batch.c)
-add_executable (draw-copypixels-sync draw-copypixels-sync.c)
-add_executable (draw-elements draw-elements.c)
-add_executable (draw-elements-base-vertex draw-elements-base-vertex.c)
-add_executable (draw-elements-base-vertex-bounds draw-elements-base-vertex-bounds.c)
-add_executable (draw-elements-base-vertex-neg draw-elements-base-vertex-neg.c)
+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)
+piglit_add_executable (blendminmax blendminmax.c)
+piglit_add_executable (blendsquare blendsquare.c)
+piglit_add_executable (clear-varray-2.0 clear-varray-2.0.c)
+piglit_add_executable (copypixels-sync copypixels-sync.c)
+piglit_add_executable (copypixels-draw-sync copypixels-draw-sync.c)
+piglit_add_executable (depth-clamp-range depth-clamp-range.c)
+piglit_add_executable (dlist-clear dlist-clear.c)
+piglit_add_executable (dlist-fdo3129-01 dlist-fdo3129-01.c)
+piglit_add_executable (dlist-fdo3129-02 dlist-fdo3129-02.c)
+piglit_add_executable (dlist-fdo31590 dlist-fdo31590.c)
+piglit_add_executable (depth_clamp depth_clamp.c)
+piglit_add_executable (depthfunc depthfunc.c)
+piglit_add_executable (depthrange-clear depthrange-clear.c)
+piglit_add_executable (draw-arrays-colormaterial draw-arrays-colormaterial.c)
+piglit_add_executable (draw-batch draw-batch.c)
+piglit_add_executable (draw-copypixels-sync draw-copypixels-sync.c)
+piglit_add_executable (draw-elements draw-elements.c)
+piglit_add_executable (draw-elements-base-vertex draw-elements-base-vertex.c)
+piglit_add_executable (draw-elements-base-vertex-bounds draw-elements-base-vertex-bounds.c)
+piglit_add_executable (draw-elements-base-vertex-neg draw-elements-base-vertex-neg.c)
 IF (UNIX)
 	target_link_libraries (draw-elements-base-vertex-neg m)
 ENDIF (UNIX)
-add_executable (draw-elements-vs-inputs draw-elements-vs-inputs.c)
-add_executable (draw-instanced draw-instanced.c)
-add_executable (draw-instanced-divisor draw-instanced-divisor.c)
-add_executable (draw-pixel-with-texture draw-pixel-with-texture.c)
-add_executable (draw-sync draw-sync.c)
-add_executable (draw-vertices draw-vertices.c)
-add_executable (draw-vertices-half-float draw-vertices-half-float.c)
-add_executable (fog-modes fog-modes.c)
+piglit_add_executable (draw-elements-vs-inputs draw-elements-vs-inputs.c)
+piglit_add_executable (draw-instanced draw-instanced.c)
+piglit_add_executable (draw-instanced-divisor draw-instanced-divisor.c)
+piglit_add_executable (draw-pixel-with-texture draw-pixel-with-texture.c)
+piglit_add_executable (draw-sync draw-sync.c)
+piglit_add_executable (draw-vertices draw-vertices.c)
+piglit_add_executable (draw-vertices-half-float draw-vertices-half-float.c)
+piglit_add_executable (fog-modes fog-modes.c)
 IF (UNIX)
 	target_link_libraries (fog-modes m)
 ENDIF (UNIX)
-add_executable (fragment-center fragment-center.c)
-add_executable (framebuffer-srgb framebuffer-srgb.c)
+piglit_add_executable (fragment-center fragment-center.c)
+piglit_add_executable (framebuffer-srgb framebuffer-srgb.c)
 IF (UNIX)
 	target_link_libraries (framebuffer-srgb m)
 ENDIF (UNIX)
-add_executable (getactiveattrib getactiveattrib.c)
-add_executable (geterror-inside-begin geterror-inside-begin.c)
-add_executable (geterror-invalid-enum geterror-invalid-enum.c)
-add_executable (gl30basic gl30basic.c)
-add_executable (hiz hiz.c)
+piglit_add_executable (getactiveattrib getactiveattrib.c)
+piglit_add_executable (geterror-inside-begin geterror-inside-begin.c)
+piglit_add_executable (geterror-invalid-enum geterror-invalid-enum.c)
+piglit_add_executable (gl30basic gl30basic.c)
+piglit_add_executable (hiz hiz.c)
 if (UNIX)
 	target_link_libraries (hiz m)
 endif (UNIX)
-add_executable (early-z early-z.c)
-add_executable (infinite-spot-light infinite-spot-light.c)
-add_executable (isbufferobj isbufferobj.c)
-add_executable (linestipple linestipple.c)
-add_executable (line-aa-width line-aa-width.c)
+piglit_add_executable (early-z early-z.c)
+piglit_add_executable (infinite-spot-light infinite-spot-light.c)
+piglit_add_executable (isbufferobj isbufferobj.c)
+piglit_add_executable (linestipple linestipple.c)
+piglit_add_executable (line-aa-width line-aa-width.c)
 IF (UNIX)
 	target_link_libraries (line-aa-width m)
 ENDIF (UNIX)
-add_executable (longprim longprim.c)
-add_executable (pos-array pos-array.c)
-add_executable (pbo-drawpixels pbo-drawpixels.c)
-add_executable (pbo-read-argb8888 pbo-read-argb8888.c)
-add_executable (pbo-readpixels-small pbo-readpixels-small.c)
-add_executable (pbo-teximage pbo-teximage.c)
-add_executable (pbo-teximage-tiling pbo-teximage-tiling.c)
-add_executable (pbo-teximage-tiling-2 pbo-teximage-tiling-2.c)
-add_executable (point-line-no-cull point-line-no-cull.c)
-add_executable (polygon-mode polygon-mode.c)
-add_executable (primitive-restart primitive-restart.c)
-add_executable (provoking-vertex provoking-vertex.c)
-add_executable (oes-read-format oes-read-format.c)
-add_executable (read-front read-front.c)
+piglit_add_executable (longprim longprim.c)
+piglit_add_executable (pos-array pos-array.c)
+piglit_add_executable (pbo-drawpixels pbo-drawpixels.c)
+piglit_add_executable (pbo-read-argb8888 pbo-read-argb8888.c)
+piglit_add_executable (pbo-readpixels-small pbo-readpixels-small.c)
+piglit_add_executable (pbo-teximage pbo-teximage.c)
+piglit_add_executable (pbo-teximage-tiling pbo-teximage-tiling.c)
+piglit_add_executable (pbo-teximage-tiling-2 pbo-teximage-tiling-2.c)
+piglit_add_executable (point-line-no-cull point-line-no-cull.c)
+piglit_add_executable (polygon-mode polygon-mode.c)
+piglit_add_executable (primitive-restart primitive-restart.c)
+piglit_add_executable (provoking-vertex provoking-vertex.c)
+piglit_add_executable (oes-read-format oes-read-format.c)
+piglit_add_executable (read-front read-front.c)
 IF (NOT MSVC)
-	add_executable (roundmode-getintegerv roundmode-getintegerv.c)
+	piglit_add_executable (roundmode-getintegerv roundmode-getintegerv.c)
 ENDIF (NOT MSVC)
 IF (NOT MSVC)
-	add_executable (roundmode-pixelstore roundmode-pixelstore.c)
+	piglit_add_executable (roundmode-pixelstore roundmode-pixelstore.c)
 ENDIF (NOT MSVC)
-add_executable (scissor-bitmap scissor-bitmap.c)
-add_executable (scissor-clear scissor-clear.c)
-add_executable (scissor-copypixels scissor-copypixels.c)
-add_executable (scissor-depth-clear scissor-depth-clear.c)
-add_executable (scissor-many scissor-many.c)
-add_executable (scissor-offscreen scissor-offscreen.c)
-add_executable (scissor-stencil-clear scissor-stencil-clear.c)
-add_executable (select select.c)
-add_executable (stencil-drawpixels stencil-drawpixels.c)
-add_executable (stencil-twoside stencil-twoside.c)
-add_executable (stencil-wrap stencil-wrap.c)
-add_executable (sync_api sync_api.c)
-add_executable (texgen texgen.c)
-add_executable (texunits texunits.c)
-add_executable (timer_query timer_query.c)
-add_executable (two-sided-lighting two-sided-lighting.c)
-add_executable (two-sided-lighting-separate-specular two-sided-lighting-separate-specular.c)
-add_executable (user-clip user-clip.c)
-add_executable (varray-disabled varray-disabled.c)
-add_executable (vao-01 vao-01.c)
-add_executable (vao-02 vao-02.c)
-add_executable (vao-element-array-buffer vao-element-array-buffer.c)
-add_executable (vbo-map-remap vbo-map-remap.c)
-add_executable (vbo-bufferdata vbo-bufferdata.c)
-add_executable (vbo-subdata-zero vbo-subdata-zero.c)
-add_executable (vbo-subdata-sync vbo-subdata-sync.c)
-add_executable (windowoverlap windowoverlap.c)
-add_executable (object_purgeable-api-pbo object_purgeable-api-pbo.c object_purgeable.c)
-add_executable (object_purgeable-api-texture object_purgeable-api-texture.c object_purgeable.c)
-add_executable (object_purgeable-api-vbo object_purgeable-api-vbo.c object_purgeable.c)
-add_executable (occlusion_query occlusion_query.c)
-add_executable (occlusion-query-discard occlusion-query-discard.c)
-add_executable (quad-invariance quad-invariance.c)
-add_executable (clear-accum clear-accum.c)
-add_executable (vs-point_size-zero vs-point_size-zero.c)
+piglit_add_executable (scissor-bitmap scissor-bitmap.c)
+piglit_add_executable (scissor-clear scissor-clear.c)
+piglit_add_executable (scissor-copypixels scissor-copypixels.c)
+piglit_add_executable (scissor-depth-clear scissor-depth-clear.c)
+piglit_add_executable (scissor-many scissor-many.c)
+piglit_add_executable (scissor-offscreen scissor-offscreen.c)
+piglit_add_executable (scissor-stencil-clear scissor-stencil-clear.c)
+piglit_add_executable (select select.c)
+piglit_add_executable (stencil-drawpixels stencil-drawpixels.c)
+piglit_add_executable (stencil-twoside stencil-twoside.c)
+piglit_add_executable (stencil-wrap stencil-wrap.c)
+piglit_add_executable (sync_api sync_api.c)
+piglit_add_executable (texgen texgen.c)
+piglit_add_executable (texunits texunits.c)
+piglit_add_executable (timer_query timer_query.c)
+piglit_add_executable (two-sided-lighting two-sided-lighting.c)
+piglit_add_executable (two-sided-lighting-separate-specular two-sided-lighting-separate-specular.c)
+piglit_add_executable (user-clip user-clip.c)
+piglit_add_executable (varray-disabled varray-disabled.c)
+piglit_add_executable (vao-01 vao-01.c)
+piglit_add_executable (vao-02 vao-02.c)
+piglit_add_executable (vao-element-array-buffer vao-element-array-buffer.c)
+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)
+piglit_add_executable (occlusion_query occlusion_query.c)
+piglit_add_executable (occlusion-query-discard occlusion-query-discard.c)
+piglit_add_executable (quad-invariance quad-invariance.c)
+piglit_add_executable (clear-accum clear-accum.c)
+piglit_add_executable (vs-point_size-zero vs-point_size-zero.c)
 
 # vim: ft=cmake:
diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt
index 0221a2509..9a478b226 100644
--- a/tests/glean/CMakeLists.gl.txt
+++ b/tests/glean/CMakeLists.gl.txt
@@ -15,7 +15,7 @@ include_directories(
 	${piglit_SOURCE_DIR}/tests/util
 )
 
-add_executable (glean
+piglit_add_executable (glean
 	codedid.cpp
 	dsconfig.cpp
 	dsfilt.cpp
diff --git a/tests/gles2/CMakeLists.gles2.txt b/tests/gles2/CMakeLists.gles2.txt
index db23f3178..a32d35e1a 100644
--- a/tests/gles2/CMakeLists.gles2.txt
+++ b/tests/gles2/CMakeLists.gles2.txt
@@ -11,7 +11,7 @@ link_libraries(
 	piglitutil_gles2
 	)
 
-add_executable(gles2_shader_runner
+piglit_add_executable(gles2_shader_runner
 	gles2_shader_runner.c
 	)
 
diff --git a/tests/glslparsertest/CMakeLists.gl.txt b/tests/glslparsertest/CMakeLists.gl.txt
index bb58eeb34..f78e17951 100644
--- a/tests/glslparsertest/CMakeLists.gl.txt
+++ b/tests/glslparsertest/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries(
 	${GLUT_glut_LIBRARY}
 	)
 
-add_executable (glslparsertest glslparsertest.c)
+piglit_add_executable (glslparsertest glslparsertest.c)
 
 # vim: ft=cmake:
diff --git a/tests/glslparsertest/CMakeLists.gles2.txt b/tests/glslparsertest/CMakeLists.gles2.txt
index 123254893..b217722e7 100644
--- a/tests/glslparsertest/CMakeLists.gles2.txt
+++ b/tests/glslparsertest/CMakeLists.gles2.txt
@@ -4,7 +4,7 @@ link_libraries(
 	${OPENGL_gles2_LIBRARY}
 	)
 
-add_executable(glslparsertest_${piglit_target_api}
+piglit_add_executable(glslparsertest_${piglit_target_api}
 	glslparsertest.c
 	)
 
diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
index 4477585f0..8d83a871d 100644
--- a/tests/glx/CMakeLists.gl.txt
+++ b/tests/glx/CMakeLists.gl.txt
@@ -17,49 +17,49 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	include_directories(
 		${GLPROTO_INCLUDE_DIRS}
 	)
-	add_executable (glx-fbconfig-sanity glx-fbconfig-sanity.c)
-	add_executable (glx-fbconfig-compliance glx-fbconfig-compliance.c)
-	add_executable (glx-fbo-binding glx-fbo-binding.c)
-	add_executable (glx-shader-sharing glx-shader-sharing.c)
-	add_executable (glx-close-display glx-close-display.c)
-	add_executable (glx-destroycontext-1 glx-destroycontext-1.c)
-	add_executable (glx-destroycontext-2 glx-destroycontext-2.c)
-	add_executable (glx-multi-context-ib-1 glx-multi-context-ib-1.c)
-	add_executable (glx-multithread glx-multithread.c)
+	piglit_add_executable (glx-fbconfig-sanity glx-fbconfig-sanity.c)
+	piglit_add_executable (glx-fbconfig-compliance glx-fbconfig-compliance.c)
+	piglit_add_executable (glx-fbo-binding glx-fbo-binding.c)
+	piglit_add_executable (glx-shader-sharing glx-shader-sharing.c)
+	piglit_add_executable (glx-close-display glx-close-display.c)
+	piglit_add_executable (glx-destroycontext-1 glx-destroycontext-1.c)
+	piglit_add_executable (glx-destroycontext-2 glx-destroycontext-2.c)
+	piglit_add_executable (glx-multi-context-ib-1 glx-multi-context-ib-1.c)
+	piglit_add_executable (glx-multithread glx-multithread.c)
 	target_link_libraries(glx-multithread pthread)
-	add_executable (glx-multithread-makecurrent-1 glx-multithread-makecurrent-1.c)
+	piglit_add_executable (glx-multithread-makecurrent-1 glx-multithread-makecurrent-1.c)
 	target_link_libraries(glx-multithread-makecurrent-1 pthread)
-	add_executable (glx-multithread-makecurrent-2 glx-multithread-makecurrent-2.c)
+	piglit_add_executable (glx-multithread-makecurrent-2 glx-multithread-makecurrent-2.c)
 	target_link_libraries(glx-multithread-makecurrent-2 pthread)
-	add_executable (glx-multithread-makecurrent-3 glx-multithread-makecurrent-3.c)
+	piglit_add_executable (glx-multithread-makecurrent-3 glx-multithread-makecurrent-3.c)
 	target_link_libraries(glx-multithread-makecurrent-3 pthread)
-	add_executable (glx-multithread-makecurrent-4 glx-multithread-makecurrent-4.c)
+	piglit_add_executable (glx-multithread-makecurrent-4 glx-multithread-makecurrent-4.c)
 	target_link_libraries(glx-multithread-makecurrent-4 pthread)
-	add_executable (glx-make-current glx-make-current.c)
-	add_executable (glx-swap-event glx-swap-event.c)
-	add_executable (glx-make-glxdrawable-current glx-make-glxdrawable-current.c)
-	add_executable (glx-swap-exchange glx-swap-exchange.c)
-	add_executable (glx-swap-pixmap glx-swap-pixmap.c)
-	add_executable (glx-swap-pixmap-bad glx-swap-pixmap-bad.c)
-	add_executable (glx-swap-singlebuffer glx-swap-singlebuffer.c)
+	piglit_add_executable (glx-make-current glx-make-current.c)
+	piglit_add_executable (glx-swap-event glx-swap-event.c)
+	piglit_add_executable (glx-make-glxdrawable-current glx-make-glxdrawable-current.c)
+	piglit_add_executable (glx-swap-exchange glx-swap-exchange.c)
+	piglit_add_executable (glx-swap-pixmap glx-swap-pixmap.c)
+	piglit_add_executable (glx-swap-pixmap-bad glx-swap-pixmap-bad.c)
+	piglit_add_executable (glx-swap-singlebuffer glx-swap-singlebuffer.c)
 
 	if (X11_Xrender_FOUND)
 		include_directories(${X11_Xrender_INCLUDE_PATH})
-		add_executable (glx-tfp glx-tfp.c)
+		piglit_add_executable (glx-tfp glx-tfp.c)
 		target_link_libraries(glx-tfp ${X11_Xrender_LIB})
 	endif()
 
-	add_executable (glx-pixmap-life glx-pixmap-life.c)
-	add_executable (glx-pixmap13-life glx-pixmap13-life.c)
-	add_executable (glx-window-life glx-window-life.c)
-	add_executable (glx-pixmap-multi glx-pixmap-multi.c)
-	add_executable (glx-pixmap-crosscheck glx-pixmap-crosscheck.c)
+	piglit_add_executable (glx-pixmap-life glx-pixmap-life.c)
+	piglit_add_executable (glx-pixmap13-life glx-pixmap13-life.c)
+	piglit_add_executable (glx-window-life glx-window-life.c)
+	piglit_add_executable (glx-pixmap-multi glx-pixmap-multi.c)
+	piglit_add_executable (glx-pixmap-crosscheck glx-pixmap-crosscheck.c)
 
-	add_executable (glx-visuals-depth glx-visuals-depth.c)
-	add_executable (glx-visuals-stencil glx-visuals-stencil.c)
+	piglit_add_executable (glx-visuals-depth glx-visuals-depth.c)
+	piglit_add_executable (glx-visuals-stencil glx-visuals-stencil.c)
 
-	add_executable (glx-copy-sub-buffer glx-copy-sub-buffer.c)
-	add_executable (glx-query-drawable glx-query-drawable.c)
+	piglit_add_executable (glx-copy-sub-buffer glx-copy-sub-buffer.c)
+	piglit_add_executable (glx-query-drawable glx-query-drawable.c)
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 # vim: ft=cmake:
diff --git a/tests/hiz/CMakeLists.gl.txt b/tests/hiz/CMakeLists.gl.txt
index a64295ade..cd646f27d 100644
--- a/tests/hiz/CMakeLists.gl.txt
+++ b/tests/hiz/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 	${GLUT_INCLUDE_DIR}
 	)
 
-add_library(hiz-util
+piglit_add_library(hiz-util
 	hiz-util.c
 	)
 
@@ -19,29 +19,29 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable(hiz-depth-stencil-test-fbo-d0-s8 hiz-depth-stencil-test-fbo-d0-s8.c)
-add_executable(hiz-depth-stencil-test-fbo-d24-s0 hiz-depth-stencil-test-fbo-d24-s0.c)
-add_executable(hiz-depth-stencil-test-fbo-d24-s8 hiz-depth-stencil-test-fbo-d24-s8.c)
-add_executable(hiz-depth-stencil-test-fbo-d24s8 hiz-depth-stencil-test-fbo-d24s8.c)
-add_executable(hiz-depth-read-fbo-d24-s0 hiz-depth-read-fbo-d24-s0.c)
-add_executable(hiz-depth-read-fbo-d24-s8 hiz-depth-read-fbo-d24-s8.c)
-add_executable(hiz-depth-read-fbo-d24s8 hiz-depth-read-fbo-d24s8.c)
-add_executable(hiz-depth-read-window-stencil0 hiz-depth-read-window-stencil0.c)
-add_executable(hiz-depth-read-window-stencil1 hiz-depth-read-window-stencil1.c)
-add_executable(hiz-depth-test-fbo-d24-s0 hiz-depth-test-fbo-d24-s0.c)
-add_executable(hiz-depth-test-fbo-d24-s8 hiz-depth-test-fbo-d24-s8.c)
-add_executable(hiz-depth-test-fbo-d24s8 hiz-depth-test-fbo-d24s8.c)
-add_executable(hiz-depth-test-window-stencil0 hiz-depth-test-window-stencil0.c)
-add_executable(hiz-depth-test-window-stencil1 hiz-depth-test-window-stencil1.c)
-add_executable(hiz-stencil-read-fbo-d0-s8 hiz-stencil-read-fbo-d0-s8.c)
-add_executable(hiz-stencil-read-fbo-d24-s8 hiz-stencil-read-fbo-d24-s8.c)
-add_executable(hiz-stencil-read-fbo-d24s8 hiz-stencil-read-fbo-d24s8.c)
-add_executable(hiz-stencil-read-window-depth0 hiz-stencil-read-window-depth0.c)
-add_executable(hiz-stencil-read-window-depth1 hiz-stencil-read-window-depth1.c)
-add_executable(hiz-stencil-test-fbo-d0-s8 hiz-stencil-test-fbo-d0-s8.c)
-add_executable(hiz-stencil-test-fbo-d24-s8 hiz-stencil-test-fbo-d24-s8.c)
-add_executable(hiz-stencil-test-fbo-d24s8 hiz-stencil-test-fbo-d24s8.c)
-add_executable(hiz-stencil-test-window-depth0 hiz-stencil-test-window-depth0.c)
-add_executable(hiz-stencil-test-window-depth1 hiz-stencil-test-window-depth1.c)
+piglit_add_executable(hiz-depth-stencil-test-fbo-d0-s8 hiz-depth-stencil-test-fbo-d0-s8.c)
+piglit_add_executable(hiz-depth-stencil-test-fbo-d24-s0 hiz-depth-stencil-test-fbo-d24-s0.c)
+piglit_add_executable(hiz-depth-stencil-test-fbo-d24-s8 hiz-depth-stencil-test-fbo-d24-s8.c)
+piglit_add_executable(hiz-depth-stencil-test-fbo-d24s8 hiz-depth-stencil-test-fbo-d24s8.c)
+piglit_add_executable(hiz-depth-read-fbo-d24-s0 hiz-depth-read-fbo-d24-s0.c)
+piglit_add_executable(hiz-depth-read-fbo-d24-s8 hiz-depth-read-fbo-d24-s8.c)
+piglit_add_executable(hiz-depth-read-fbo-d24s8 hiz-depth-read-fbo-d24s8.c)
+piglit_add_executable(hiz-depth-read-window-stencil0 hiz-depth-read-window-stencil0.c)
+piglit_add_executable(hiz-depth-read-window-stencil1 hiz-depth-read-window-stencil1.c)
+piglit_add_executable(hiz-depth-test-fbo-d24-s0 hiz-depth-test-fbo-d24-s0.c)
+piglit_add_executable(hiz-depth-test-fbo-d24-s8 hiz-depth-test-fbo-d24-s8.c)
+piglit_add_executable(hiz-depth-test-fbo-d24s8 hiz-depth-test-fbo-d24s8.c)
+piglit_add_executable(hiz-depth-test-window-stencil0 hiz-depth-test-window-stencil0.c)
+piglit_add_executable(hiz-depth-test-window-stencil1 hiz-depth-test-window-stencil1.c)
+piglit_add_executable(hiz-stencil-read-fbo-d0-s8 hiz-stencil-read-fbo-d0-s8.c)
+piglit_add_executable(hiz-stencil-read-fbo-d24-s8 hiz-stencil-read-fbo-d24-s8.c)
+piglit_add_executable(hiz-stencil-read-fbo-d24s8 hiz-stencil-read-fbo-d24s8.c)
+piglit_add_executable(hiz-stencil-read-window-depth0 hiz-stencil-read-window-depth0.c)
+piglit_add_executable(hiz-stencil-read-window-depth1 hiz-stencil-read-window-depth1.c)
+piglit_add_executable(hiz-stencil-test-fbo-d0-s8 hiz-stencil-test-fbo-d0-s8.c)
+piglit_add_executable(hiz-stencil-test-fbo-d24-s8 hiz-stencil-test-fbo-d24-s8.c)
+piglit_add_executable(hiz-stencil-test-fbo-d24s8 hiz-stencil-test-fbo-d24s8.c)
+piglit_add_executable(hiz-stencil-test-window-depth0 hiz-stencil-test-window-depth0.c)
+piglit_add_executable(hiz-stencil-test-window-depth1 hiz-stencil-test-window-depth1.c)
 
 # vim: ft=cmake:
diff --git a/tests/mesa/tests/CMakeLists.gl.txt b/tests/mesa/tests/CMakeLists.gl.txt
index b20a8d479..dc60f8ec5 100644
--- a/tests/mesa/tests/CMakeLists.gl.txt
+++ b/tests/mesa/tests/CMakeLists.gl.txt
@@ -18,7 +18,7 @@ add_definitions (
 	${PNG_DEFINITIONS}
 )
 
-add_executable (texline texline.c)
+piglit_add_executable (texline texline.c)
 IF (UNIX)
        target_link_libraries (texline m)
 ENDIF (UNIX)
diff --git a/tests/mesa/util/CMakeLists.gl.txt b/tests/mesa/util/CMakeLists.gl.txt
index 066a01bc5..d06db3a99 100644
--- a/tests/mesa/util/CMakeLists.gl.txt
+++ b/tests/mesa/util/CMakeLists.gl.txt
@@ -16,7 +16,7 @@ add_definitions (
 	${PNG_DEFINITIONS}
 )
 
-add_library (mesautil
+piglit_add_library (mesautil
 	readtex.c
 	writeimg.c
 )
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 8e090d868..7d8b12e32 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -13,164 +13,164 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (glsl-max-vertex-attrib glsl-max-vertex-attrib.c)
-add_executable (activeprogram-bad-program activeprogram-bad-program.c)
-add_executable (activeprogram-get activeprogram-get.c)
-add_executable (ati-fs-bad-delete ati-fs-bad-delete.c)
-add_executable (attribute0 attribute0.c)
-add_executable (createshaderprogram-bad-type createshaderprogram-bad-type.c)
-add_executable (createshaderprogram-attached-shaders createshaderprogram-attached-shaders.c)
-add_executable (trinity-fp1 trinity-fp1.c)
-add_executable (fp-abs-01 fp-abs-01.c)
-add_executable (fp-abs-02 fp-abs-02.c)
-add_executable (fp-condition_codes-01 fp-condition_codes-01.c)
-add_executable (fp-lit-mask fp-lit-mask.c)
-add_executable (fp-lit-src-equals-dst fp-lit-src-equals-dst.c)
-add_executable (fp-fog fp-fog.c)
-add_executable (fp-formats fp-formats.c)
-add_executable (fp-fragment-position fp-fragment-position.c)
-add_executable (fp-kil fp-kil.c)
-add_executable (fp-incomplete-tex fp-incomplete-tex.c)
-add_executable (fp-indirections fp-indirections.c)
-add_executable (fp-indirections2 fp-indirections2.c)
-add_executable (fp-long-alu fp-long-alu.c)
-add_executable (fp-rfl fp-rfl.c)
+piglit_add_executable (glsl-max-vertex-attrib glsl-max-vertex-attrib.c)
+piglit_add_executable (activeprogram-bad-program activeprogram-bad-program.c)
+piglit_add_executable (activeprogram-get activeprogram-get.c)
+piglit_add_executable (ati-fs-bad-delete ati-fs-bad-delete.c)
+piglit_add_executable (attribute0 attribute0.c)
+piglit_add_executable (createshaderprogram-bad-type createshaderprogram-bad-type.c)
+piglit_add_executable (createshaderprogram-attached-shaders createshaderprogram-attached-shaders.c)
+piglit_add_executable (trinity-fp1 trinity-fp1.c)
+piglit_add_executable (fp-abs-01 fp-abs-01.c)
+piglit_add_executable (fp-abs-02 fp-abs-02.c)
+piglit_add_executable (fp-condition_codes-01 fp-condition_codes-01.c)
+piglit_add_executable (fp-lit-mask fp-lit-mask.c)
+piglit_add_executable (fp-lit-src-equals-dst fp-lit-src-equals-dst.c)
+piglit_add_executable (fp-fog fp-fog.c)
+piglit_add_executable (fp-formats fp-formats.c)
+piglit_add_executable (fp-fragment-position fp-fragment-position.c)
+piglit_add_executable (fp-kil fp-kil.c)
+piglit_add_executable (fp-incomplete-tex fp-incomplete-tex.c)
+piglit_add_executable (fp-indirections fp-indirections.c)
+piglit_add_executable (fp-indirections2 fp-indirections2.c)
+piglit_add_executable (fp-long-alu fp-long-alu.c)
+piglit_add_executable (fp-rfl fp-rfl.c)
 IF (UNIX)
 	target_link_libraries(fp-rfl m)
 ENDIF (UNIX)
-add_executable (fp-set-01 fp-set-01.c)
-add_executable (fp-set-02 fp-set-02.c)
-add_executable (fp-unpack-01 fp-unpack-01.c)
+piglit_add_executable (fp-set-01 fp-set-01.c)
+piglit_add_executable (fp-set-02 fp-set-02.c)
+piglit_add_executable (fp-unpack-01 fp-unpack-01.c)
 IF (UNIX)
 	target_link_libraries(fp-unpack-01 m)
 ENDIF (UNIX)
-add_executable (glsl-arb-fragment-coord-conventions glsl-arb-fragment-coord-conventions.c)
-add_executable (glsl-arb-fragment-coord-conventions-define glsl-arb-fragment-coord-conventions-define.c)
-add_executable (glsl-bindattriblocation glsl-bindattriblocation.c)
-add_executable (glsl-bug-22603 glsl-bug-22603.c)
-add_executable (glsl-dlist-getattriblocation glsl-dlist-getattriblocation.c)
-add_executable (glsl-explicit-location-01 glsl-explicit-location-01.c)
-add_executable (glsl-explicit-location-02 glsl-explicit-location-02.c)
-add_executable (glsl-explicit-location-03 glsl-explicit-location-03.c)
-add_executable (glsl-explicit-location-04 glsl-explicit-location-04.c)
-add_executable (glsl-explicit-location-05 glsl-explicit-location-05.c)
-add_executable (glsl-getattriblocation glsl-getattriblocation.c)
-add_executable (glsl-getactiveuniform-array-size glsl-getactiveuniform-array-size.c)
-add_executable (glsl-getactiveuniform-count glsl-getactiveuniform-count.c)
-add_executable (glsl-getactiveuniform-length glsl-getactiveuniform-length.c)
-add_executable (getuniform-01 getuniform-01.c)
-add_executable (getuniform-02 getuniform-02.c)
-add_executable (glsl-invalid-asm-01 glsl-invalid-asm-01.c)
-add_executable (glsl-invalid-asm-02 glsl-invalid-asm-02.c)
-add_executable (glsl-novertexdata glsl-novertexdata.c)
-add_executable (glsl-orangebook-ch06-bump glsl-orangebook-ch06-bump.c)
-add_executable (glsl-reload-source glsl-reload-source.c)
-add_executable (glsl-unused-varying glsl-unused-varying.c)
-add_executable (glsl-uniform-update glsl-uniform-update.c)
-add_executable (glsl-uniform-out-of-bounds glsl-uniform-out-of-bounds.c)
-add_executable (glsl-fs-bug25902 glsl-fs-bug25902.c)
-add_executable (glsl-fs-color-matrix glsl-fs-color-matrix.c)
-add_executable (glsl-fs-exp2 glsl-fs-exp2.c)
-add_executable (glsl-fs-flat-color glsl-fs-flat-color.c)
-add_executable (glsl-fs-fogcolor-statechange glsl-fs-fogcolor-statechange.c)
-add_executable (glsl-fs-fragcoord glsl-fs-fragcoord.c)
-add_executable (glsl-fs-fragcoord-zw-ortho glsl-fs-fragcoord-zw-ortho.c)
-add_executable (glsl-fs-fragcoord-zw-perspective glsl-fs-fragcoord-zw-perspective.c)
-add_executable (glsl-fs-loop glsl-fs-loop.c)
-add_executable (glsl-fs-loop-nested glsl-fs-loop-nested.c)
-add_executable (glsl-fs-mix glsl-fs-mix.c)
-add_executable (glsl-fs-mix-constant glsl-fs-mix-constant.c)
+piglit_add_executable (glsl-arb-fragment-coord-conventions glsl-arb-fragment-coord-conventions.c)
+piglit_add_executable (glsl-arb-fragment-coord-conventions-define glsl-arb-fragment-coord-conventions-define.c)
+piglit_add_executable (glsl-bindattriblocation glsl-bindattriblocation.c)
+piglit_add_executable (glsl-bug-22603 glsl-bug-22603.c)
+piglit_add_executable (glsl-dlist-getattriblocation glsl-dlist-getattriblocation.c)
+piglit_add_executable (glsl-explicit-location-01 glsl-explicit-location-01.c)
+piglit_add_executable (glsl-explicit-location-02 glsl-explicit-location-02.c)
+piglit_add_executable (glsl-explicit-location-03 glsl-explicit-location-03.c)
+piglit_add_executable (glsl-explicit-location-04 glsl-explicit-location-04.c)
+piglit_add_executable (glsl-explicit-location-05 glsl-explicit-location-05.c)
+piglit_add_executable (glsl-getattriblocation glsl-getattriblocation.c)
+piglit_add_executable (glsl-getactiveuniform-array-size glsl-getactiveuniform-array-size.c)
+piglit_add_executable (glsl-getactiveuniform-count glsl-getactiveuniform-count.c)
+piglit_add_executable (glsl-getactiveuniform-length glsl-getactiveuniform-length.c)
+piglit_add_executable (getuniform-01 getuniform-01.c)
+piglit_add_executable (getuniform-02 getuniform-02.c)
+piglit_add_executable (glsl-invalid-asm-01 glsl-invalid-asm-01.c)
+piglit_add_executable (glsl-invalid-asm-02 glsl-invalid-asm-02.c)
+piglit_add_executable (glsl-novertexdata glsl-novertexdata.c)
+piglit_add_executable (glsl-orangebook-ch06-bump glsl-orangebook-ch06-bump.c)
+piglit_add_executable (glsl-reload-source glsl-reload-source.c)
+piglit_add_executable (glsl-unused-varying glsl-unused-varying.c)
+piglit_add_executable (glsl-uniform-update glsl-uniform-update.c)
+piglit_add_executable (glsl-uniform-out-of-bounds glsl-uniform-out-of-bounds.c)
+piglit_add_executable (glsl-fs-bug25902 glsl-fs-bug25902.c)
+piglit_add_executable (glsl-fs-color-matrix glsl-fs-color-matrix.c)
+piglit_add_executable (glsl-fs-exp2 glsl-fs-exp2.c)
+piglit_add_executable (glsl-fs-flat-color glsl-fs-flat-color.c)
+piglit_add_executable (glsl-fs-fogcolor-statechange glsl-fs-fogcolor-statechange.c)
+piglit_add_executable (glsl-fs-fragcoord glsl-fs-fragcoord.c)
+piglit_add_executable (glsl-fs-fragcoord-zw-ortho glsl-fs-fragcoord-zw-ortho.c)
+piglit_add_executable (glsl-fs-fragcoord-zw-perspective glsl-fs-fragcoord-zw-perspective.c)
+piglit_add_executable (glsl-fs-loop glsl-fs-loop.c)
+piglit_add_executable (glsl-fs-loop-nested glsl-fs-loop-nested.c)
+piglit_add_executable (glsl-fs-mix glsl-fs-mix.c)
+piglit_add_executable (glsl-fs-mix-constant glsl-fs-mix-constant.c)
 IF (NOT MSVC)
-	add_executable (glsl-fs-raytrace-bug27060 glsl-fs-raytrace-bug27060.c)
+	piglit_add_executable (glsl-fs-raytrace-bug27060 glsl-fs-raytrace-bug27060.c)
 ENDIF (NOT MSVC)
-add_executable (glsl-fs-sampler-numbering glsl-fs-sampler-numbering.c)
-add_executable (glsl-fs-shader-stencil-export glsl-fs-shader-stencil-export.c)
-add_executable (glsl-fs-sqrt-branch glsl-fs-sqrt-branch.c)
-add_executable (glsl-fs-sqrt-zero glsl-fs-sqrt-zero.c)
-add_executable (glsl-fs-texturecube glsl-fs-texturecube.c)
-add_executable (glsl-fs-texturecube-2 glsl-fs-texturecube-2.c)
-add_executable (glsl-fs-textureenvcolor-statechange glsl-fs-textureenvcolor-statechange.c)
-add_executable (glsl-fs-texture2drect glsl-fs-texture2drect.c)
-add_executable (glsl-fs-texturelod-01 glsl-fs-texturelod-01.c)
-add_executable (glsl-fs-user-varying-ff glsl-fs-user-varying-ff.c)
-add_executable (glsl-vs-arrays glsl-vs-arrays.c)
-add_executable (glsl-vs-mov-after-deref glsl-vs-mov-after-deref.c)
-add_executable (glsl-vs-mvp-statechange glsl-vs-mvp-statechange.c)
-add_executable (glsl-vs-normalscale glsl-vs-normalscale.c)
-add_executable (glsl-vs-functions glsl-vs-functions.c)
-add_executable (glsl-vs-texturematrix-1 glsl-vs-texturematrix-1.c)
-add_executable (glsl-vs-texturematrix-2 glsl-vs-texturematrix-2.c)
-add_executable (glsl-fs-pointcoord glsl-fs-pointcoord.c)
-add_executable (glsl-vs-if-bool glsl-vs-if-bool.c)
-add_executable (glsl-vs-loop glsl-vs-loop.c)
-add_executable (glsl-vs-loop-nested glsl-vs-loop-nested.c)
+piglit_add_executable (glsl-fs-sampler-numbering glsl-fs-sampler-numbering.c)
+piglit_add_executable (glsl-fs-shader-stencil-export glsl-fs-shader-stencil-export.c)
+piglit_add_executable (glsl-fs-sqrt-branch glsl-fs-sqrt-branch.c)
+piglit_add_executable (glsl-fs-sqrt-zero glsl-fs-sqrt-zero.c)
+piglit_add_executable (glsl-fs-texturecube glsl-fs-texturecube.c)
+piglit_add_executable (glsl-fs-texturecube-2 glsl-fs-texturecube-2.c)
+piglit_add_executable (glsl-fs-textureenvcolor-statechange glsl-fs-textureenvcolor-statechange.c)
+piglit_add_executable (glsl-fs-texture2drect glsl-fs-texture2drect.c)
+piglit_add_executable (glsl-fs-texturelod-01 glsl-fs-texturelod-01.c)
+piglit_add_executable (glsl-fs-user-varying-ff glsl-fs-user-varying-ff.c)
+piglit_add_executable (glsl-vs-arrays glsl-vs-arrays.c)
+piglit_add_executable (glsl-vs-mov-after-deref glsl-vs-mov-after-deref.c)
+piglit_add_executable (glsl-vs-mvp-statechange glsl-vs-mvp-statechange.c)
+piglit_add_executable (glsl-vs-normalscale glsl-vs-normalscale.c)
+piglit_add_executable (glsl-vs-functions glsl-vs-functions.c)
+piglit_add_executable (glsl-vs-texturematrix-1 glsl-vs-texturematrix-1.c)
+piglit_add_executable (glsl-vs-texturematrix-2 glsl-vs-texturematrix-2.c)
+piglit_add_executable (glsl-fs-pointcoord glsl-fs-pointcoord.c)
+piglit_add_executable (glsl-vs-if-bool glsl-vs-if-bool.c)
+piglit_add_executable (glsl-vs-loop glsl-vs-loop.c)
+piglit_add_executable (glsl-vs-loop-nested glsl-vs-loop-nested.c)
 IF (NOT MSVC)
-	add_executable (glsl-vs-raytrace-bug26691 glsl-vs-raytrace-bug26691.c)
+	piglit_add_executable (glsl-vs-raytrace-bug26691 glsl-vs-raytrace-bug26691.c)
 ENDIF (NOT MSVC)
-add_executable (glsl-vs-sqrt-zero glsl-vs-sqrt-zero.c)
-add_executable (glsl-vs-statechange-1 glsl-vs-statechange-1.c)
-add_executable (glsl-vs-user-varying-ff glsl-vs-user-varying-ff.c)
-add_executable (glsl-light-model glsl-light-model.c)
-add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
-add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
-add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
-add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
-add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
-add_executable (glsl-link-test glsl-link-test.c)
-add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
-add_executable (vp-address-01 vp-address-01.c)
-add_executable (vp-address-02 vp-address-02.c)
-add_executable (vp-address-03 vp-address-03.c)
-add_executable (vp-address-04 vp-address-04.c)
-add_executable (vp-address-05 vp-address-05.c)
-add_executable (vp-address-06 vp-address-06.c)
-add_executable (vp-bad-program vp-bad-program.c)
-add_executable (vp-combined-image-units vp-combined-image-units.c)
-add_executable (vp-clipdistance-01 vp-clipdistance-01.c)
-add_executable (vp-clipdistance-02 vp-clipdistance-02.c)
-add_executable (vp-clipdistance-03 vp-clipdistance-03.c)
-add_executable (vp-clipdistance-04 vp-clipdistance-04.c)
-add_executable (vpfp-generic vpfp-generic.cpp)
-add_executable (vp-max-array vp-max-array.c)
-add_executable (glsl-derivs glsl-derivs.c)
-add_executable (glsl-deriv-varyings glsl-deriv-varyings.c)
-add_executable (glsl-fs-discard-02 glsl-fs-discard-02.c)
-add_executable (glsl-fwidth glsl-fwidth.c)
-add_executable (glsl-lod-bias glsl-lod-bias.c)
-add_executable (glsl-preprocessor-comments glsl-preprocessor-comments.c)
-add_executable (vp-ignore-input vp-ignore-input.c)
-add_executable (glsl-empty-vs-no-fs glsl-empty-vs-no-fs.c)
-add_executable (glsl-mat-attribute glsl-mat-attribute.c)
-add_executable (glsl-max-varyings glsl-max-varyings.c)
-add_executable (glsl-useprogram-displaylist glsl-useprogram-displaylist.c)
-add_executable (glsl-routing glsl-routing.c)
-add_executable (shader_runner shader_runner.c)
-add_executable (glsl-vs-point-size glsl-vs-point-size.c)
-add_executable (glsl-sin glsl-sin.c)
+piglit_add_executable (glsl-vs-sqrt-zero glsl-vs-sqrt-zero.c)
+piglit_add_executable (glsl-vs-statechange-1 glsl-vs-statechange-1.c)
+piglit_add_executable (glsl-vs-user-varying-ff glsl-vs-user-varying-ff.c)
+piglit_add_executable (glsl-light-model glsl-light-model.c)
+piglit_add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
+piglit_add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
+piglit_add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
+piglit_add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
+piglit_add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
+piglit_add_executable (glsl-link-test glsl-link-test.c)
+piglit_add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
+piglit_add_executable (vp-address-01 vp-address-01.c)
+piglit_add_executable (vp-address-02 vp-address-02.c)
+piglit_add_executable (vp-address-03 vp-address-03.c)
+piglit_add_executable (vp-address-04 vp-address-04.c)
+piglit_add_executable (vp-address-05 vp-address-05.c)
+piglit_add_executable (vp-address-06 vp-address-06.c)
+piglit_add_executable (vp-bad-program vp-bad-program.c)
+piglit_add_executable (vp-combined-image-units vp-combined-image-units.c)
+piglit_add_executable (vp-clipdistance-01 vp-clipdistance-01.c)
+piglit_add_executable (vp-clipdistance-02 vp-clipdistance-02.c)
+piglit_add_executable (vp-clipdistance-03 vp-clipdistance-03.c)
+piglit_add_executable (vp-clipdistance-04 vp-clipdistance-04.c)
+piglit_add_executable (vpfp-generic vpfp-generic.cpp)
+piglit_add_executable (vp-max-array vp-max-array.c)
+piglit_add_executable (glsl-derivs glsl-derivs.c)
+piglit_add_executable (glsl-deriv-varyings glsl-deriv-varyings.c)
+piglit_add_executable (glsl-fs-discard-02 glsl-fs-discard-02.c)
+piglit_add_executable (glsl-fwidth glsl-fwidth.c)
+piglit_add_executable (glsl-lod-bias glsl-lod-bias.c)
+piglit_add_executable (glsl-preprocessor-comments glsl-preprocessor-comments.c)
+piglit_add_executable (vp-ignore-input vp-ignore-input.c)
+piglit_add_executable (glsl-empty-vs-no-fs glsl-empty-vs-no-fs.c)
+piglit_add_executable (glsl-mat-attribute glsl-mat-attribute.c)
+piglit_add_executable (glsl-max-varyings glsl-max-varyings.c)
+piglit_add_executable (glsl-useprogram-displaylist glsl-useprogram-displaylist.c)
+piglit_add_executable (glsl-routing glsl-routing.c)
+piglit_add_executable (shader_runner shader_runner.c)
+piglit_add_executable (glsl-vs-point-size glsl-vs-point-size.c)
+piglit_add_executable (glsl-sin glsl-sin.c)
 IF (UNIX)
 	target_link_libraries(glsl-sin m)
 ENDIF (UNIX)
-add_executable (glsl-cos glsl-cos.c)
+piglit_add_executable (glsl-cos glsl-cos.c)
 IF (UNIX)
 	target_link_libraries(glsl-cos m)
 ENDIF (UNIX)
-add_executable (glsl-kwin-blur-1 glsl-kwin-blur-1.c)
-add_executable (glsl-kwin-blur-2 glsl-kwin-blur-2.c)
-add_executable (link-mismatch-layout-01 link-mismatch-layout-01.c)
-add_executable (link-mismatch-layout-02 link-mismatch-layout-02.c)
-add_executable (link-mismatch-layout-03 link-mismatch-layout-03.c)
-add_executable (link-unresolved-function link-unresolved-function.c)
-add_executable (sso-simple sso-simple.c)
-add_executable (sso-uniforms-01 sso-uniforms-01.c)
-add_executable (sso-uniforms-02 sso-uniforms-02.c)
-add_executable (sso-user-varying-01 sso-user-varying-01.c)
-add_executable (sso-user-varying-02 sso-user-varying-02.c)
-add_executable (useprogram-flushverts-1 useprogram-flushverts-1.c)
-add_executable (useprogram-flushverts-2 useprogram-flushverts-2.c)
-add_executable (useprogram-inside-begin useprogram-inside-begin.c)
-add_executable (useprogram-refcount-1 useprogram-refcount-1.c)
-add_executable (useshaderprogram-bad-type useshaderprogram-bad-type.c)
-add_executable (useshaderprogram-bad-program useshaderprogram-bad-program.c)
-add_executable (useshaderprogram-flushverts-1 useshaderprogram-flushverts-1.c)
+piglit_add_executable (glsl-kwin-blur-1 glsl-kwin-blur-1.c)
+piglit_add_executable (glsl-kwin-blur-2 glsl-kwin-blur-2.c)
+piglit_add_executable (link-mismatch-layout-01 link-mismatch-layout-01.c)
+piglit_add_executable (link-mismatch-layout-02 link-mismatch-layout-02.c)
+piglit_add_executable (link-mismatch-layout-03 link-mismatch-layout-03.c)
+piglit_add_executable (link-unresolved-function link-unresolved-function.c)
+piglit_add_executable (sso-simple sso-simple.c)
+piglit_add_executable (sso-uniforms-01 sso-uniforms-01.c)
+piglit_add_executable (sso-uniforms-02 sso-uniforms-02.c)
+piglit_add_executable (sso-user-varying-01 sso-user-varying-01.c)
+piglit_add_executable (sso-user-varying-02 sso-user-varying-02.c)
+piglit_add_executable (useprogram-flushverts-1 useprogram-flushverts-1.c)
+piglit_add_executable (useprogram-flushverts-2 useprogram-flushverts-2.c)
+piglit_add_executable (useprogram-inside-begin useprogram-inside-begin.c)
+piglit_add_executable (useprogram-refcount-1 useprogram-refcount-1.c)
+piglit_add_executable (useshaderprogram-bad-type useshaderprogram-bad-type.c)
+piglit_add_executable (useshaderprogram-bad-program useshaderprogram-bad-program.c)
+piglit_add_executable (useshaderprogram-flushverts-1 useshaderprogram-flushverts-1.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt b/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
index d2de44c9b..94f8795d2 100644
--- a/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
+++ b/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (amd_seamless_cubemap_per_texture amd_seamless_cubemap_per_texture.c)
+piglit_add_executable (amd_seamless_cubemap_per_texture amd_seamless_cubemap_per_texture.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt b/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
index b835e91ac..5ee67bad6 100644
--- a/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
+++ b/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
@@ -11,7 +11,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_blend_func_extended-bindfragdataindexed-invalid-parameters bindfragdataindexed-invalid-parameters.c)
-add_executable (arb_blend_func_extended-getfragdataindex getfragdataindex.c)
-add_executable (arb_blend_func_extended-blend-api blend-api)
+piglit_add_executable (arb_blend_func_extended-bindfragdataindexed-invalid-parameters bindfragdataindexed-invalid-parameters.c)
+piglit_add_executable (arb_blend_func_extended-getfragdataindex getfragdataindex.c)
+piglit_add_executable (arb_blend_func_extended-blend-api blend-api)
 # vim: ft=cmake:
diff --git a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
index 67c3efc14..4db9a0066 100644
--- a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
@@ -12,13 +12,13 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_color_buffer_float-getteximage getteximage.c)
-add_executable (arb_color_buffer_float-queries queries.c)
-add_executable (arb_color_buffer_float-readpixels readpixels.c)
-add_executable (arb_color_buffer_float-probepixel probepixel.c)
-add_executable (arb_color_buffer_float-drawpixels drawpixels.c)
-add_executable (arb_color_buffer_float-clear clear.c)
-add_executable (arb_color_buffer_float-render render.c)
-add_executable (arb_color_buffer_float-mrt mrt.c)
+piglit_add_executable (arb_color_buffer_float-getteximage getteximage.c)
+piglit_add_executable (arb_color_buffer_float-queries queries.c)
+piglit_add_executable (arb_color_buffer_float-readpixels readpixels.c)
+piglit_add_executable (arb_color_buffer_float-probepixel probepixel.c)
+piglit_add_executable (arb_color_buffer_float-drawpixels drawpixels.c)
+piglit_add_executable (arb_color_buffer_float-clear clear.c)
+piglit_add_executable (arb_color_buffer_float-render render.c)
+piglit_add_executable (arb_color_buffer_float-mrt mrt.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
index 85ecebefb..017b526d4 100644
--- a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
+++ b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
@@ -11,14 +11,14 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (copy_buffer_coherency copy_buffer_coherency.c)
-add_executable (copybuffersubdata copybuffersubdata.c)
-add_executable (arb_copy_buffer-dlist dlist.c)
-add_executable (arb_copy_buffer-get get.c)
-add_executable (arb_copy_buffer-overlap overlap.c)
-add_executable (arb_copy_buffer-negative-bound-zero negative-bound-zero.c)
-add_executable (arb_copy_buffer-negative-bounds negative-bounds.c)
-add_executable (arb_copy_buffer-negative-mapped negative-mapped.c)
-add_executable (arb_copy_buffer-targets targets.c)
+piglit_add_executable (copy_buffer_coherency copy_buffer_coherency.c)
+piglit_add_executable (copybuffersubdata copybuffersubdata.c)
+piglit_add_executable (arb_copy_buffer-dlist dlist.c)
+piglit_add_executable (arb_copy_buffer-get get.c)
+piglit_add_executable (arb_copy_buffer-overlap overlap.c)
+piglit_add_executable (arb_copy_buffer-negative-bound-zero negative-bound-zero.c)
+piglit_add_executable (arb_copy_buffer-negative-bounds negative-bounds.c)
+piglit_add_executable (arb_copy_buffer-negative-mapped negative-mapped.c)
+piglit_add_executable (arb_copy_buffer-targets targets.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_debug_output/CMakeLists.gl.txt b/tests/spec/arb_debug_output/CMakeLists.gl.txt
index 8bbcadab1..17365891c 100644
--- a/tests/spec/arb_debug_output/CMakeLists.gl.txt
+++ b/tests/spec/arb_debug_output/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_debug_output-api_error api_error.c)
+piglit_add_executable (arb_debug_output-api_error api_error.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
index bd4fa9b1a..dd4aaed80 100644
--- a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_draw_buffers-state_change state_change.c)
+piglit_add_executable (arb_draw_buffers-state_change state_change.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
index 578eef402..04174eeef 100644
--- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
@@ -11,7 +11,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (draw-elements-instanced-base-vertex draw-elements-instanced-base-vertex.c)
-add_executable (arb_draw_elements_base_vertex-dlist-arb_draw_instanced dlist-arb_draw_instanced.c)
+piglit_add_executable (draw-elements-instanced-base-vertex draw-elements-instanced-base-vertex.c)
+piglit_add_executable (arb_draw_elements_base_vertex-dlist-arb_draw_instanced dlist-arb_draw_instanced.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
index a8466c53d..590127de4 100644
--- a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
@@ -12,7 +12,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_draw_instanced-dlist dlist.c)
-add_executable (arb_draw_instanced-elements elements.c)
-add_executable (arb_draw_instanced-negative-arrays-first-negative negative-arrays-first-negative.c)
-add_executable (arb_draw_instanced-negative-elements-type negative-elements-type.c)
+piglit_add_executable (arb_draw_instanced-dlist dlist.c)
+piglit_add_executable (arb_draw_instanced-elements elements.c)
+piglit_add_executable (arb_draw_instanced-negative-arrays-first-negative negative-arrays-first-negative.c)
+piglit_add_executable (arb_draw_instanced-negative-elements-type negative-elements-type.c)
diff --git a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
index 10e8c9e49..abac5a13d 100644
--- a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
+++ b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
@@ -13,13 +13,13 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_es2_compatibility-depthrangef arb_es2_compatibility-depthrangef.c)
-add_executable (arb_es2_compatibility-drawbuffers arb_es2_compatibility-drawbuffers.c)
-add_executable (arb_es2_compatibility-maxvectors arb_es2_compatibility-maxvectors.c)
-add_executable (arb_es2_compatibility-releaseshadercompiler arb_es2_compatibility-releaseshadercompiler.c)
-add_executable (arb_es2_compatibility-shadercompiler arb_es2_compatibility-shadercompiler.c)
-add_executable (arb_es2_compatibility-getshaderprecisionformat arb_es2_compatibility-getshaderprecisionformat.c)
-add_executable (arb_es2_compatibility-fixed-type arb_es2_compatibility-fixed-type.c)
-add_executable (fbo-missing-attachment-clear fbo-missing-attachment-clear.c)
-add_executable (fbo-missing-attachment-blit fbo-missing-attachment-blit.c)
+piglit_add_executable (arb_es2_compatibility-depthrangef arb_es2_compatibility-depthrangef.c)
+piglit_add_executable (arb_es2_compatibility-drawbuffers arb_es2_compatibility-drawbuffers.c)
+piglit_add_executable (arb_es2_compatibility-maxvectors arb_es2_compatibility-maxvectors.c)
+piglit_add_executable (arb_es2_compatibility-releaseshadercompiler arb_es2_compatibility-releaseshadercompiler.c)
+piglit_add_executable (arb_es2_compatibility-shadercompiler arb_es2_compatibility-shadercompiler.c)
+piglit_add_executable (arb_es2_compatibility-getshaderprecisionformat arb_es2_compatibility-getshaderprecisionformat.c)
+piglit_add_executable (arb_es2_compatibility-fixed-type arb_es2_compatibility-fixed-type.c)
+piglit_add_executable (fbo-missing-attachment-clear fbo-missing-attachment-clear.c)
+piglit_add_executable (fbo-missing-attachment-blit fbo-missing-attachment-blit.c)
 # vim: ft=cmake:
diff --git a/tests/spec/arb_fragment_program/CMakeLists.gl.txt b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
index 039b70e96..2d51b7236 100644
--- a/tests/spec/arb_fragment_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_fragment_program-minmax minmax.c)
+piglit_add_executable (arb_fragment_program-minmax minmax.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
index c46f5ff19..14b881131 100644
--- a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
@@ -12,7 +12,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable(same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c)
-add_executable(same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c)
+piglit_add_executable(same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c)
+piglit_add_executable(same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
index 73ab24666..d9685c5e8 100644
--- a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
+++ b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (instanced_arrays instanced_arrays.c)
+piglit_add_executable (instanced_arrays instanced_arrays.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
index b3adea3a5..cd9d6e410 100644
--- a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
+++ b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
@@ -11,7 +11,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (map_buffer_range_error_check map_buffer_range_error_check.c)
-add_executable (map_buffer_range_test map_buffer_range_test.c)
+piglit_add_executable (map_buffer_range_error_check map_buffer_range_error_check.c)
+piglit_add_executable (map_buffer_range_test map_buffer_range_test.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_multisample/CMakeLists.gl.txt b/tests/spec/arb_multisample/CMakeLists.gl.txt
index 9c551ac69..623900dbb 100644
--- a/tests/spec/arb_multisample/CMakeLists.gl.txt
+++ b/tests/spec/arb_multisample/CMakeLists.gl.txt
@@ -11,5 +11,5 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_multisample-beginend beginend.c)
-add_executable (arb_multisample-pushpop pushpop.c)
+piglit_add_executable (arb_multisample-beginend beginend.c)
+piglit_add_executable (arb_multisample-pushpop pushpop.c)
diff --git a/tests/spec/arb_robustness/CMakeLists.gl.txt b/tests/spec/arb_robustness/CMakeLists.gl.txt
index a7e1a21cf..e19a598f9 100644
--- a/tests/spec/arb_robustness/CMakeLists.gl.txt
+++ b/tests/spec/arb_robustness/CMakeLists.gl.txt
@@ -12,7 +12,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_robustness_draw-vbo-bounds draw-vbo-bounds.c)
-add_executable (arb_robustness_client-mem-bounds client-mem-bounds.c)
+piglit_add_executable (arb_robustness_draw-vbo-bounds draw-vbo-bounds.c)
+piglit_add_executable (arb_robustness_client-mem-bounds client-mem-bounds.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
index 20fd6f2d0..1046be8f6 100644
--- a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
@@ -11,7 +11,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (sampler-objects sampler-objects.c)
-add_executable (sampler-incomplete sampler-incomplete.c)
+piglit_add_executable (sampler-objects sampler-objects.c)
+piglit_add_executable (sampler-incomplete sampler-incomplete.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
index b92b75094..2a6bdd3b7 100644
--- a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
+++ b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_seamless_cubemap arb_seamless_cubemap.c)
+piglit_add_executable (arb_seamless_cubemap arb_seamless_cubemap.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_shader_objects/CMakeLists.gl.txt b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
index 0da17ff00..12b16d525 100644
--- a/tests/spec/arb_shader_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
@@ -11,8 +11,8 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_shader_objects-bindattriblocation-scratch-name bindattriblocation-scratch-name.c)
-add_executable (arb_shader_objects-getuniform getuniform.c)
-add_executable (arb_shader_objects-getuniformlocation-array-of-struct-of-array getuniformlocation-array-of-struct-of-array.c)
-add_executable (arb_shader_objects-clear-with-deleted clear-with-deleted.c)
-add_executable (arb_shader_objects-delete-repeat delete-repeat.c)
+piglit_add_executable (arb_shader_objects-bindattriblocation-scratch-name bindattriblocation-scratch-name.c)
+piglit_add_executable (arb_shader_objects-getuniform getuniform.c)
+piglit_add_executable (arb_shader_objects-getuniformlocation-array-of-struct-of-array getuniformlocation-array-of-struct-of-array.c)
+piglit_add_executable (arb_shader_objects-clear-with-deleted clear-with-deleted.c)
+piglit_add_executable (arb_shader_objects-delete-repeat delete-repeat.c)
diff --git a/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
index 20282f5e2..e1e83f852 100644
--- a/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_shader_texture_lod-texgrad texgrad.c)
+piglit_add_executable (arb_shader_texture_lod-texgrad texgrad.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
index aa606a7e2..939b53cfa 100644
--- a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
@@ -12,7 +12,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_texture_buffer_object-minmax minmax.c)
-add_executable (arb_texture_buffer_object-negative-bad-bo negative-bad-bo.c)
-add_executable (arb_texture_buffer_object-negative-bad-format negative-bad-format.c)
-add_executable (arb_texture_buffer_object-negative-bad-target negative-bad-target.c)
+piglit_add_executable (arb_texture_buffer_object-minmax minmax.c)
+piglit_add_executable (arb_texture_buffer_object-negative-bad-bo negative-bad-bo.c)
+piglit_add_executable (arb_texture_buffer_object-negative-bad-format negative-bad-format.c)
+piglit_add_executable (arb_texture_buffer_object-negative-bad-target negative-bad-target.c)
diff --git a/tests/spec/arb_texture_compression/CMakeLists.gl.txt b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
index d970c1213..0e09dcc0e 100644
--- a/tests/spec/arb_texture_compression/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
@@ -11,7 +11,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_texture_compression-internal-format-query internal-format-query.c)
-add_executable (arb_texture_compression-invalid-formats invalid-formats.c)
+piglit_add_executable (arb_texture_compression-internal-format-query internal-format-query.c)
+piglit_add_executable (arb_texture_compression-invalid-formats invalid-formats.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_texture_float/CMakeLists.gl.txt b/tests/spec/arb_texture_float/CMakeLists.gl.txt
index 1e819dd1c..14df21f5b 100644
--- a/tests/spec/arb_texture_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_float/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_texture_float-texture-float-formats texture-float-formats.c)
+piglit_add_executable (arb_texture_float-texture-float-formats texture-float-formats.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_texture_storage/CMakeLists.gl.txt b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
index f942756c7..a4d33d404 100644
--- a/tests/spec/arb_texture_storage/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_texture_storage-texture-storage texture-storage.c)
+piglit_add_executable (arb_texture_storage-texture-storage texture-storage.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
index ac12fcd73..fe4e04d30 100644
--- a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
+++ b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_transform_feedback2-draw-auto draw-auto.c)
+piglit_add_executable (arb_transform_feedback2-draw-auto draw-auto.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
index 390e76d7c..60b0d6ac8 100644
--- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
@@ -11,7 +11,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_vertex_buffer_object-elements-negative-offset elements-negative-offset.c)
-add_executable (arb_vertex_buffer_object-mixed-immediate-and-vbo mixed-immediate-and-vbo.c)
+piglit_add_executable (arb_vertex_buffer_object-elements-negative-offset elements-negative-offset.c)
+piglit_add_executable (arb_vertex_buffer_object-mixed-immediate-and-vbo mixed-immediate-and-vbo.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_vertex_program/CMakeLists.gl.txt b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
index 22c285172..a6e62525e 100644
--- a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
@@ -11,8 +11,8 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (arb_vertex_program-getenv4d-with-error getenv4d-with-error.c)
-add_executable (arb_vertex_program-getlocal4d-with-error getlocal4d-with-error.c)
-add_executable (arb_vertex_program-minmax minmax.c)
+piglit_add_executable (arb_vertex_program-getenv4d-with-error getenv4d-with-error.c)
+piglit_add_executable (arb_vertex_program-getlocal4d-with-error getlocal4d-with-error.c)
+piglit_add_executable (arb_vertex_program-minmax minmax.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt b/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
index 7cc967a6a..8cfc832d8 100644
--- a/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (draw-vertices-2101010 draw-vertices-2101010.c)
+piglit_add_executable (draw-vertices-2101010 draw-vertices-2101010.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
index 16ce10c96..f333e8ff4 100644
--- a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
@@ -11,8 +11,8 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (ati_draw_buffers-arbfp arbfp.c)
-add_executable (ati_draw_buffers-arbfp-no-index arbfp-no-index.c)
-add_executable (ati_draw_buffers-arbfp-no-option arbfp-no-option.c)
+piglit_add_executable (ati_draw_buffers-arbfp arbfp.c)
+piglit_add_executable (ati_draw_buffers-arbfp-no-index arbfp-no-index.c)
+piglit_add_executable (ati_draw_buffers-arbfp-no-option arbfp-no-option.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
index 1d97f5be2..a1d5a0025 100644
--- a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
+++ b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
@@ -12,6 +12,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (ati_envmap_bumpmap-bump bump.c)
+piglit_add_executable (ati_envmap_bumpmap-bump bump.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/ext_fog_coord/CMakeLists.gl.txt b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
index 7bc722aab..86e45055d 100644
--- a/tests/spec/ext_fog_coord/CMakeLists.gl.txt
+++ b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
@@ -12,7 +12,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (ext_fog_coord-modes modes.c)
+piglit_add_executable (ext_fog_coord-modes modes.c)
 IF (UNIX)
 	target_link_libraries (ext_fog_coord-modes m)
 ENDIF (UNIX)
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index d94b3afa5..d6b85e12c 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -11,13 +11,13 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (ext_framebuffer_multisample-dlist dlist.c)
-add_executable (ext_framebuffer_multisample-minmax minmax.c)
-add_executable (ext_framebuffer_multisample-negative-copypixels negative-copypixels.c)
-add_executable (ext_framebuffer_multisample-negative-copyteximage negative-copyteximage.c)
-add_executable (ext_framebuffer_multisample-negative-max-samples negative-max-samples.c)
-add_executable (ext_framebuffer_multisample-negative-mismatched-samples negative-mismatched-samples.c)
-add_executable (ext_framebuffer_multisample-negative-readpixels negative-readpixels.c)
-add_executable (ext_framebuffer_multisample-renderbuffer-samples renderbuffer-samples.c)
-add_executable (ext_framebuffer_multisample-renderbufferstorage-samples renderbufferstorage-samples.c)
-add_executable (ext_framebuffer_multisample-samples samples.c)
+piglit_add_executable (ext_framebuffer_multisample-dlist dlist.c)
+piglit_add_executable (ext_framebuffer_multisample-minmax minmax.c)
+piglit_add_executable (ext_framebuffer_multisample-negative-copypixels negative-copypixels.c)
+piglit_add_executable (ext_framebuffer_multisample-negative-copyteximage negative-copyteximage.c)
+piglit_add_executable (ext_framebuffer_multisample-negative-max-samples negative-max-samples.c)
+piglit_add_executable (ext_framebuffer_multisample-negative-mismatched-samples negative-mismatched-samples.c)
+piglit_add_executable (ext_framebuffer_multisample-negative-readpixels negative-readpixels.c)
+piglit_add_executable (ext_framebuffer_multisample-renderbuffer-samples renderbuffer-samples.c)
+piglit_add_executable (ext_framebuffer_multisample-renderbufferstorage-samples renderbufferstorage-samples.c)
+piglit_add_executable (ext_framebuffer_multisample-samples samples.c)
diff --git a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
index a0fc8a1d6..94c77b93c 100644
--- a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (ext_packed_depth_stencil-readpixels-24_8 readpixels-24_8.c)
+piglit_add_executable (ext_packed_depth_stencil-readpixels-24_8 readpixels-24_8.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/ext_packed_float/CMakeLists.gl.txt b/tests/spec/ext_packed_float/CMakeLists.gl.txt
index 9da52cd78..a0e6fabd3 100644
--- a/tests/spec/ext_packed_float/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_float/CMakeLists.gl.txt
@@ -11,7 +11,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (ext_packed_float-pack pack.c)
-add_executable (getteximage-invalid-format-for-packed-type getteximage-invalid-format-for-packed-type.c)
+piglit_add_executable (ext_packed_float-pack pack.c)
+piglit_add_executable (getteximage-invalid-format-for-packed-type getteximage-invalid-format-for-packed-type.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/ext_texture_array/CMakeLists.gl.txt b/tests/spec/ext_texture_array/CMakeLists.gl.txt
index 2d0b40d0f..578cc03cb 100644
--- a/tests/spec/ext_texture_array/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_array/CMakeLists.gl.txt
@@ -11,4 +11,4 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (ext_texture_array-maxlayers maxlayers.c)
+piglit_add_executable (ext_texture_array-maxlayers maxlayers.c)
diff --git a/tests/spec/ext_texture_integer/CMakeLists.gl.txt b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
index 3fd7132e5..072996a30 100644
--- a/tests/spec/ext_texture_integer/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
@@ -12,13 +12,13 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (ext_texture_integer-fbo-blending fbo-blending.c)
-add_executable (ext_texture_integer-fbo_integer_precision_clear fbo-integer-precision-clear.c)
-add_executable (ext_texture_integer-fbo_integer_readpixels_sint_uint fbo-integer-readpixels-sint-uint.c)
-add_executable (ext_texture_integer-getteximage-clamping getteximage-clamping.c)
-add_executable (ext_texture_integer-texture_integer_glsl130 texture-integer-glsl130.c)
-add_executable (ext_texture_integer-api-drawpixels api-drawpixels.c)
-add_executable (ext_texture_integer-api-readpixels api-readpixels.c)
-add_executable (ext_texture_integer-api-teximage api-teximage.c)
+piglit_add_executable (ext_texture_integer-fbo-blending fbo-blending.c)
+piglit_add_executable (ext_texture_integer-fbo_integer_precision_clear fbo-integer-precision-clear.c)
+piglit_add_executable (ext_texture_integer-fbo_integer_readpixels_sint_uint fbo-integer-readpixels-sint-uint.c)
+piglit_add_executable (ext_texture_integer-getteximage-clamping getteximage-clamping.c)
+piglit_add_executable (ext_texture_integer-texture_integer_glsl130 texture-integer-glsl130.c)
+piglit_add_executable (ext_texture_integer-api-drawpixels api-drawpixels.c)
+piglit_add_executable (ext_texture_integer-api-readpixels api-readpixels.c)
+piglit_add_executable (ext_texture_integer-api-teximage api-teximage.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/ext_timer_query/CMakeLists.gl.txt b/tests/spec/ext_timer_query/CMakeLists.gl.txt
index 36e0ad819..057c25fc4 100644
--- a/tests/spec/ext_timer_query/CMakeLists.gl.txt
+++ b/tests/spec/ext_timer_query/CMakeLists.gl.txt
@@ -12,5 +12,5 @@ link_libraries (
 )
 
 IF (UNIX)
-   add_executable (ext_timer_query-time-elapsed time-elapsed.c)
+   piglit_add_executable (ext_timer_query-time-elapsed time-elapsed.c)
 ENDIF (UNIX)
diff --git a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
index 8436db27c..ed1a37cb9 100644
--- a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
+++ b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
@@ -11,27 +11,27 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (ext_transform_feedback-alignment alignment.c)
-add_executable (ext_transform_feedback-api-errors api-errors.c)
-add_executable (ext_transform_feedback-buffer-usage buffer-usage.c)
-add_executable (ext_transform_feedback-builtin-varyings builtin-varyings.c)
-add_executable (ext_transform_feedback-discard-api discard-api.c)
-add_executable (ext_transform_feedback-discard-bitmap discard-bitmap.c)
-add_executable (ext_transform_feedback-discard-clear discard-clear.c)
-add_executable (ext_transform_feedback-discard-copypixels discard-copypixels.c)
-add_executable (ext_transform_feedback-discard-drawarrays discard-drawarrays.c)
-add_executable (ext_transform_feedback-discard-drawpixels discard-drawpixels.c)
-add_executable (ext_transform_feedback-generatemipmap generatemipmap.c)
-add_executable (ext_transform_feedback-get-buffer-state get-buffer-state.c)
-add_executable (ext_transform_feedback-position position.c)
-add_executable (ext_transform_feedback-immediate-reuse immediate-reuse.c)
-add_executable (ext_transform_feedback-interleaved interleaved.c)
-add_executable (ext_transform_feedback-intervening-read intervening-read.c)
-add_executable (ext_transform_feedback-max-varyings max-varyings.c)
-add_executable (ext_transform_feedback-separate separate.c)
-add_executable (ext_transform_feedback-output-type output-type.c)
-add_executable (ext_transform_feedback-order order.c)
-add_executable (ext_transform_feedback-overflow-edge-cases overflow-edge-cases.c)
-add_executable (ext_transform_feedback-tessellation tessellation.c)
+piglit_add_executable (ext_transform_feedback-alignment alignment.c)
+piglit_add_executable (ext_transform_feedback-api-errors api-errors.c)
+piglit_add_executable (ext_transform_feedback-buffer-usage buffer-usage.c)
+piglit_add_executable (ext_transform_feedback-builtin-varyings builtin-varyings.c)
+piglit_add_executable (ext_transform_feedback-discard-api discard-api.c)
+piglit_add_executable (ext_transform_feedback-discard-bitmap discard-bitmap.c)
+piglit_add_executable (ext_transform_feedback-discard-clear discard-clear.c)
+piglit_add_executable (ext_transform_feedback-discard-copypixels discard-copypixels.c)
+piglit_add_executable (ext_transform_feedback-discard-drawarrays discard-drawarrays.c)
+piglit_add_executable (ext_transform_feedback-discard-drawpixels discard-drawpixels.c)
+piglit_add_executable (ext_transform_feedback-generatemipmap generatemipmap.c)
+piglit_add_executable (ext_transform_feedback-get-buffer-state get-buffer-state.c)
+piglit_add_executable (ext_transform_feedback-position position.c)
+piglit_add_executable (ext_transform_feedback-immediate-reuse immediate-reuse.c)
+piglit_add_executable (ext_transform_feedback-interleaved interleaved.c)
+piglit_add_executable (ext_transform_feedback-intervening-read intervening-read.c)
+piglit_add_executable (ext_transform_feedback-max-varyings max-varyings.c)
+piglit_add_executable (ext_transform_feedback-separate separate.c)
+piglit_add_executable (ext_transform_feedback-output-type output-type.c)
+piglit_add_executable (ext_transform_feedback-order order.c)
+piglit_add_executable (ext_transform_feedback-overflow-edge-cases overflow-edge-cases.c)
+piglit_add_executable (ext_transform_feedback-tessellation tessellation.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/gl-2.0/CMakeLists.gl.txt b/tests/spec/gl-2.0/CMakeLists.gl.txt
index e712e12fb..5ad939ae9 100644
--- a/tests/spec/gl-2.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/CMakeLists.gl.txt
@@ -12,4 +12,4 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (vertex-program-two-side vertex-program-two-side.c)
+piglit_add_executable (vertex-program-two-side vertex-program-two-side.c)
diff --git a/tests/spec/gl-2.0/api/CMakeLists.gl.txt b/tests/spec/gl-2.0/api/CMakeLists.gl.txt
index 5db44dca4..b455301d0 100644
--- a/tests/spec/gl-2.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/api/CMakeLists.gl.txt
@@ -11,7 +11,7 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (getattriblocation-conventional getattriblocation-conventional.c)
-add_executable (clip-flag-behavior clip-flag-behavior.c)
+piglit_add_executable (getattriblocation-conventional getattriblocation-conventional.c)
+piglit_add_executable (clip-flag-behavior clip-flag-behavior.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/gl-2.1/CMakeLists.gl.txt b/tests/spec/gl-2.1/CMakeLists.gl.txt
index ab8c53ae6..f422313b8 100644
--- a/tests/spec/gl-2.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.1/CMakeLists.gl.txt
@@ -12,4 +12,4 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (gl-2.1-minmax minmax.c)
+piglit_add_executable (gl-2.1-minmax minmax.c)
diff --git a/tests/spec/gl-3.0/CMakeLists.gl.txt b/tests/spec/gl-3.0/CMakeLists.gl.txt
index 42d17ae28..304e4d768 100644
--- a/tests/spec/gl-3.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/CMakeLists.gl.txt
@@ -11,9 +11,9 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (gl-3.0-minmax minmax.c)
-add_executable (gl-3.0-required-sized-texture-formats required-sized-texture-formats.c)
-add_executable (gl-3.0-required-renderbuffer-attachment-formats required-renderbuffer-attachment-formats.c)
-add_executable (gl-3.0-required-texture-attachment-formats required-texture-attachment-formats.c)
+piglit_add_executable (gl-3.0-minmax minmax.c)
+piglit_add_executable (gl-3.0-required-sized-texture-formats required-sized-texture-formats.c)
+piglit_add_executable (gl-3.0-required-renderbuffer-attachment-formats required-renderbuffer-attachment-formats.c)
+piglit_add_executable (gl-3.0-required-texture-attachment-formats required-texture-attachment-formats.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/gl-3.0/api/CMakeLists.gl.txt b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
index d3025f569..a945dbbd1 100644
--- a/tests/spec/gl-3.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
@@ -11,16 +11,16 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (bindfragdata-invalid-parameters bindfragdata-invalid-parameters.c)
-add_executable (bindfragdata-link-error bindfragdata-link-error.c)
-add_executable (bindfragdata-nonexistent-variable bindfragdata-nonexistent-variable.c)
-add_executable (clearbuffer-depth clearbuffer-common.c clearbuffer-depth.c)
-add_executable (clearbuffer-depth-stencil clearbuffer-common.c clearbuffer-depth-stencil.c)
-add_executable (clearbuffer-display-lists clearbuffer-common.c clearbuffer-display-lists.c)
-add_executable (clearbuffer-invalid-drawbuffer clearbuffer-invalid-drawbuffer.c)
-add_executable (clearbuffer-invalid-buffer clearbuffer-invalid-buffer.c)
-add_executable (clearbuffer-mixed-format clearbuffer-common.c clearbuffer-mixed-format.c)
-add_executable (clearbuffer-stencil clearbuffer-common.c clearbuffer-stencil.c)
-add_executable (getfragdatalocation getfragdatalocation.c)
+piglit_add_executable (bindfragdata-invalid-parameters bindfragdata-invalid-parameters.c)
+piglit_add_executable (bindfragdata-link-error bindfragdata-link-error.c)
+piglit_add_executable (bindfragdata-nonexistent-variable bindfragdata-nonexistent-variable.c)
+piglit_add_executable (clearbuffer-depth clearbuffer-common.c clearbuffer-depth.c)
+piglit_add_executable (clearbuffer-depth-stencil clearbuffer-common.c clearbuffer-depth-stencil.c)
+piglit_add_executable (clearbuffer-display-lists clearbuffer-common.c clearbuffer-display-lists.c)
+piglit_add_executable (clearbuffer-invalid-drawbuffer clearbuffer-invalid-drawbuffer.c)
+piglit_add_executable (clearbuffer-invalid-buffer clearbuffer-invalid-buffer.c)
+piglit_add_executable (clearbuffer-mixed-format clearbuffer-common.c clearbuffer-mixed-format.c)
+piglit_add_executable (clearbuffer-stencil clearbuffer-common.c clearbuffer-stencil.c)
+piglit_add_executable (getfragdatalocation getfragdatalocation.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/gl-3.1/CMakeLists.gl.txt b/tests/spec/gl-3.1/CMakeLists.gl.txt
index a9876c7f2..608e457c5 100644
--- a/tests/spec/gl-3.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.1/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (gl-3.1-minmax minmax.c)
+piglit_add_executable (gl-3.1-minmax minmax.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt b/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
index 68f94a971..41454d24d 100644
--- a/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
@@ -13,4 +13,4 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (clip-plane-transformation clip-plane-transformation.c)
+piglit_add_executable (clip-plane-transformation clip-plane-transformation.c)
diff --git a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
index 52e4f613a..2bac526be 100644
--- a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (recursion recursion.c)
+piglit_add_executable (recursion recursion.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/glsl-1.30/CMakeLists.gl.txt b/tests/spec/glsl-1.30/CMakeLists.gl.txt
index 60f2196b4..3364994f5 100644
--- a/tests/spec/glsl-1.30/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/CMakeLists.gl.txt
@@ -11,4 +11,4 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (glsl-1.30-texel-offset-limits texel-offset-limits.c)
+piglit_add_executable (glsl-1.30-texel-offset-limits texel-offset-limits.c)
diff --git a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
index 9da7eacbd..4e2351d13 100644
--- a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
@@ -12,11 +12,11 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (fs-texelFetch-2D fs-texelFetch-2D.c)
-add_executable (fs-texelFetchOffset-2D fs-texelFetchOffset-2D.c)
+piglit_add_executable (fs-texelFetch-2D fs-texelFetch-2D.c)
+piglit_add_executable (fs-texelFetchOffset-2D fs-texelFetchOffset-2D.c)
 IF (NOT MSVC)
-	add_executable (isinf-and-isnan isinf-and-isnan.c)
+	piglit_add_executable (isinf-and-isnan isinf-and-isnan.c)
 ENDIF (NOT MSVC)
-add_executable (vertexid-beginend vertexid-beginend.c)
-add_executable (vertexid-drawarrays vertexid-drawarrays.c)
-add_executable (vertexid-drawelements vertexid-drawelements.c)
+piglit_add_executable (vertexid-beginend vertexid-beginend.c)
+piglit_add_executable (vertexid-drawarrays vertexid-drawarrays.c)
+piglit_add_executable (vertexid-drawelements vertexid-drawelements.c)
diff --git a/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt b/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
index 8f5198562..002868617 100644
--- a/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
@@ -13,4 +13,4 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (max-clip-distances max-clip-distances.c)
+piglit_add_executable (max-clip-distances max-clip-distances.c)
diff --git a/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt b/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
index 150dd979c..c49807283 100644
--- a/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
@@ -13,4 +13,4 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (mixing-clip-distance-and-clip-vertex-disallowed mixing-clip-distance-and-clip-vertex-disallowed.c)
+piglit_add_executable (mixing-clip-distance-and-clip-vertex-disallowed mixing-clip-distance-and-clip-vertex-disallowed.c)
diff --git a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
index a43bfbeab..a3d58a209 100644
--- a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
@@ -17,17 +17,17 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	include_directories(
 		${GLPROTO_INCLUDE_DIRS}
 	)
-	add_executable (glx-create-context-default-major-version default-major-version.c common.c)
-	add_executable (glx-create-context-default-minor-version default-minor-version.c common.c)
-	add_executable (glx-create-context-invalid-attribute invalid-attribute.c common.c)
-	add_executable (glx-create-context-invalid-flag invalid-flag.c common.c)
-	add_executable (glx-create-context-invalid-flag-forward-compatible invalid-flag-forward-compatible.c common.c)
-	add_executable (glx-create-context-invalid-gl-version invalid-gl-version.c common.c)
-	add_executable (glx-create-context-invalid-render-type invalid-render-type.c common.c)
-	add_executable (glx-create-context-invalid-render-type-color-index invalid-render-type-color-index.c common.c)
-	add_executable (glx-create-context-valid-attribute-empty valid-attribute-empty.c common.c)
-	add_executable (glx-create-context-valid-attribute-null valid-attribute-null.c common.c)
-	add_executable (glx-create-context-valid-flag-forward-compatible valid-flag-forward-compatible.c common.c)
+	piglit_add_executable (glx-create-context-default-major-version default-major-version.c common.c)
+	piglit_add_executable (glx-create-context-default-minor-version default-minor-version.c common.c)
+	piglit_add_executable (glx-create-context-invalid-attribute invalid-attribute.c common.c)
+	piglit_add_executable (glx-create-context-invalid-flag invalid-flag.c common.c)
+	piglit_add_executable (glx-create-context-invalid-flag-forward-compatible invalid-flag-forward-compatible.c common.c)
+	piglit_add_executable (glx-create-context-invalid-gl-version invalid-gl-version.c common.c)
+	piglit_add_executable (glx-create-context-invalid-render-type invalid-render-type.c common.c)
+	piglit_add_executable (glx-create-context-invalid-render-type-color-index invalid-render-type-color-index.c common.c)
+	piglit_add_executable (glx-create-context-valid-attribute-empty valid-attribute-empty.c common.c)
+	piglit_add_executable (glx-create-context-valid-attribute-null valid-attribute-null.c common.c)
+	piglit_add_executable (glx-create-context-valid-flag-forward-compatible valid-flag-forward-compatible.c common.c)
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 # vim: ft=cmake:
diff --git a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
index aad44a3cb..7df4cd95e 100644
--- a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
@@ -17,15 +17,15 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	include_directories(
 		${GLPROTO_INCLUDE_DIRS}
 	)
-	add_executable (glx-free-context free-context.c common.c)
-	add_executable (glx-get-context-id get-context-id.c common.c)
-	add_executable (glx-get-current-display-ext get-current-display.c common.c)
-	add_executable (glx-import-context-has-same-context-id import-context-has-same-context-id.c common.c)
-	add_executable (glx-import-context-multi-process import-context-multi-process.c common.c)
-	add_executable (glx-import-context-single-process import-context-single-process.c common.c)
-	add_executable (glx-make-current-multi-process make-current-multi-process.c common.c)
-	add_executable (glx-make-current-single-process make-current-single-process.c common.c)
-	add_executable (glx-query-context-info-ext query-context-info.c common.c)
+	piglit_add_executable (glx-free-context free-context.c common.c)
+	piglit_add_executable (glx-get-context-id get-context-id.c common.c)
+	piglit_add_executable (glx-get-current-display-ext get-current-display.c common.c)
+	piglit_add_executable (glx-import-context-has-same-context-id import-context-has-same-context-id.c common.c)
+	piglit_add_executable (glx-import-context-multi-process import-context-multi-process.c common.c)
+	piglit_add_executable (glx-import-context-single-process import-context-single-process.c common.c)
+	piglit_add_executable (glx-make-current-multi-process make-current-multi-process.c common.c)
+	piglit_add_executable (glx-make-current-single-process make-current-single-process.c common.c)
+	piglit_add_executable (glx-query-context-info-ext query-context-info.c common.c)
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 # vim: ft=cmake:
diff --git a/tests/spec/nv_conditional_render/CMakeLists.gl.txt b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
index eda4a398d..670daac62 100644
--- a/tests/spec/nv_conditional_render/CMakeLists.gl.txt
+++ b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
@@ -11,15 +11,15 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (nv_conditional_render-begin-while-active begin-while-active.c)
-add_executable (nv_conditional_render-begin-zero begin-zero.c)
-add_executable (nv_conditional_render-bitmap bitmap.c)
-add_executable (nv_conditional_render-blitframebuffer blitframebuffer.c)
-add_executable (nv_conditional_render-clear clear.c)
-add_executable (nv_conditional_render-copypixels copypixels.c)
-add_executable (nv_conditional_render-copyteximage copyteximage.c)
-add_executable (nv_conditional_render-copytexsubimage copytexsubimage.c)
-add_executable (nv_conditional_render-dlist dlist.c)
-add_executable (nv_conditional_render-drawpixels drawpixels.c)
-add_executable (nv_conditional_render-generatemipmap generatemipmap.c)
-add_executable (nv_conditional_render-vertex_array vertex_array.c)
+piglit_add_executable (nv_conditional_render-begin-while-active begin-while-active.c)
+piglit_add_executable (nv_conditional_render-begin-zero begin-zero.c)
+piglit_add_executable (nv_conditional_render-bitmap bitmap.c)
+piglit_add_executable (nv_conditional_render-blitframebuffer blitframebuffer.c)
+piglit_add_executable (nv_conditional_render-clear clear.c)
+piglit_add_executable (nv_conditional_render-copypixels copypixels.c)
+piglit_add_executable (nv_conditional_render-copyteximage copyteximage.c)
+piglit_add_executable (nv_conditional_render-copytexsubimage copytexsubimage.c)
+piglit_add_executable (nv_conditional_render-dlist dlist.c)
+piglit_add_executable (nv_conditional_render-drawpixels drawpixels.c)
+piglit_add_executable (nv_conditional_render-generatemipmap generatemipmap.c)
+piglit_add_executable (nv_conditional_render-vertex_array vertex_array.c)
diff --git a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
index 609cdac24..1b0394dbb 100644
--- a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
+++ b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (blending-in-shader blending-in-shader.c)
+piglit_add_executable (blending-in-shader blending-in-shader.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt
index ff94a5468..c82c9c5a4 100644
--- a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt
+++ b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt
@@ -9,4 +9,4 @@ link_libraries(
         ${OPENGL_gles1_LIBRARY}
         )
 
-add_executable (oes_compressed_etc1_rgb8_texture-basic oes_compressed_etc1_rgb8_texture-basic.c)
+piglit_add_executable (oes_compressed_etc1_rgb8_texture-basic oes_compressed_etc1_rgb8_texture-basic.c)
diff --git a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
index ab37b2f61..11192d3d6 100644
--- a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
+++ b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
@@ -9,4 +9,4 @@ link_libraries(
         ${OPENGL_gles1_LIBRARY}
         )
 
-add_executable (oes_compressed_paletted_texture-api oes_compressed_paletted_texture-api.c)
+piglit_add_executable (oes_compressed_paletted_texture-api oes_compressed_paletted_texture-api.c)
diff --git a/tests/spec/oes_draw_texture/CMakeLists.gles1.txt b/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
index e68bc7289..1ba0dd401 100644
--- a/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
+++ b/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
@@ -11,7 +11,7 @@ link_libraries(
 	piglitutil_gles1
 	)
 
-add_executable(oes_draw_texture
+piglit_add_executable(oes_draw_texture
 	oes_draw_texture.c
 	)
 
diff --git a/tests/texturing/CMakeLists.gl.txt b/tests/texturing/CMakeLists.gl.txt
index 01fbe9466..6246a0286 100644
--- a/tests/texturing/CMakeLists.gl.txt
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -12,76 +12,76 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (1-1-linear-texture 1-1-linear-texture.c)
-add_executable (array-texture array-texture.c)
-add_executable (compressedteximage compressedteximage.c)
-add_executable (copytexsubimage copytexsubimage.c)
-add_executable (copyteximage copyteximage.c)
-add_executable (copyteximage-border copyteximage-border.c)
-add_executable (copyteximage-clipping copyteximage-clipping.c)
+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)
+piglit_add_executable (copytexsubimage copytexsubimage.c)
+piglit_add_executable (copyteximage copyteximage.c)
+piglit_add_executable (copyteximage-border copyteximage-border.c)
+piglit_add_executable (copyteximage-clipping copyteximage-clipping.c)
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	add_executable (crossbar crossbar.c)
+	piglit_add_executable (crossbar crossbar.c)
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-add_executable (cubemap cubemap.c)
-add_executable (depth-level-clamp depth-level-clamp.c)
-add_executable (gen-compressed-teximage gen-compressed-teximage.c)
-add_executable (gen-nonzero-unit gen-nonzero-unit.c)
-add_executable (gen-teximage gen-teximage.c)
-add_executable (gen-texsubimage gen-texsubimage.c)
-add_executable (getteximage-simple getteximage-simple.c)
-add_executable (getteximage-formats getteximage-formats.c)
-add_executable (getteximage-luminance getteximage-luminance.c)
-add_executable (incomplete-texture incomplete-texture.c)
-add_executable (fragment-and-vertex-texturing fragment-and-vertex-texturing.c)
-add_executable (levelclamp levelclamp.c)
-add_executable (lodbias lodbias.c)
-add_executable (lodclamp lodclamp.c)
-add_executable (lodclamp-between lodclamp-between.c)
-add_executable (lodclamp-between-max lodclamp-between-max.c)
-add_executable (max-texture-size max-texture-size.c)
-add_executable (mipmap-setup mipmap-setup.c)
-add_executable (rg-draw-pixels rg-draw-pixels.c)
-add_executable (rg-teximage-01 rg-teximage-01.c rg-teximage-common.c)
-add_executable (rg-teximage-02 rg-teximage-02.c rg-teximage-common.c)
-add_executable (rgtc-teximage-01 rgtc-teximage-01.c rg-teximage-common.c)
-add_executable (rgtc-teximage-02 rgtc-teximage-02.c rg-teximage-common.c)
+piglit_add_executable (cubemap cubemap.c)
+piglit_add_executable (depth-level-clamp depth-level-clamp.c)
+piglit_add_executable (gen-compressed-teximage gen-compressed-teximage.c)
+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)
+piglit_add_executable (levelclamp levelclamp.c)
+piglit_add_executable (lodbias lodbias.c)
+piglit_add_executable (lodclamp lodclamp.c)
+piglit_add_executable (lodclamp-between lodclamp-between.c)
+piglit_add_executable (lodclamp-between-max lodclamp-between-max.c)
+piglit_add_executable (max-texture-size max-texture-size.c)
+piglit_add_executable (mipmap-setup mipmap-setup.c)
+piglit_add_executable (rg-draw-pixels rg-draw-pixels.c)
+piglit_add_executable (rg-teximage-01 rg-teximage-01.c rg-teximage-common.c)
+piglit_add_executable (rg-teximage-02 rg-teximage-02.c rg-teximage-common.c)
+piglit_add_executable (rgtc-teximage-01 rgtc-teximage-01.c rg-teximage-common.c)
+piglit_add_executable (rgtc-teximage-02 rgtc-teximage-02.c rg-teximage-common.c)
 IF (UNIX)
         target_link_libraries (rg-teximage-01 m)
         target_link_libraries (rg-teximage-02 m)
         target_link_libraries (rgtc-teximage-01 m)
         target_link_libraries (rgtc-teximage-02 m)
 ENDIF (UNIX)
-add_executable (s3tc-teximage s3tc-teximage.c)
-add_executable (fxt1-teximage fxt1-teximage.c)
-add_executable (s3tc-texsubimage s3tc-texsubimage.c)
-add_executable (sampler-cube-shadow sampler-cube-shadow.c)
-add_executable (streaming-texture-leak streaming-texture-leak.c)
-add_executable (tex-miplevel-selection tex-miplevel-selection.c)
-add_executable (tex3d tex3d.c)
-add_executable (tex3d-maxsize tex3d-maxsize.c)
-add_executable (tex3d-npot tex3d-npot.c)
-add_executable (texdepth texdepth.c)
-add_executable (teximage-errors teximage-errors.c)
-add_executable (texrect-many texrect-many.c)
-add_executable (texredefine texredefine.c)
-add_executable (texture-packed-formats texture-packed-formats.c)
-add_executable (texture-integer texture-integer.c)
-add_executable (depth-tex-modes      depth-tex-modes.c depth-tex-modes-common.c)
-add_executable (depth-tex-modes-rg   depth-tex-modes-rg.c depth-tex-modes-common.c)
-add_executable (depth-tex-modes-glsl depth-tex-modes-glsl.c)
-add_executable (depth-tex-compare depth-tex-compare.c)
-add_executable (depth-cube-map depth-cube-map.c)
-add_executable (sized-texture-format-channels sized-texture-format-channels.c)
-add_executable (tex-border-1 tex-border-1.c)
-add_executable (tex-skipped-unit tex-skipped-unit.c)
-add_executable (tex-swizzle tex-swizzle.c)
-add_executable (tex-srgb tex-srgb.c)
+piglit_add_executable (s3tc-teximage s3tc-teximage.c)
+piglit_add_executable (fxt1-teximage fxt1-teximage.c)
+piglit_add_executable (s3tc-texsubimage s3tc-texsubimage.c)
+piglit_add_executable (sampler-cube-shadow sampler-cube-shadow.c)
+piglit_add_executable (streaming-texture-leak streaming-texture-leak.c)
+piglit_add_executable (tex-miplevel-selection tex-miplevel-selection.c)
+piglit_add_executable (tex3d tex3d.c)
+piglit_add_executable (tex3d-maxsize tex3d-maxsize.c)
+piglit_add_executable (tex3d-npot tex3d-npot.c)
+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)
+piglit_add_executable (depth-tex-modes-glsl depth-tex-modes-glsl.c)
+piglit_add_executable (depth-tex-compare depth-tex-compare.c)
+piglit_add_executable (depth-cube-map depth-cube-map.c)
+piglit_add_executable (sized-texture-format-channels sized-texture-format-channels.c)
+piglit_add_executable (tex-border-1 tex-border-1.c)
+piglit_add_executable (tex-skipped-unit tex-skipped-unit.c)
+piglit_add_executable (tex-swizzle tex-swizzle.c)
+piglit_add_executable (tex-srgb tex-srgb.c)
 IF (UNIX)
         target_link_libraries (tex-srgb m)
 ENDIF (UNIX)
-add_executable (texsubimage texsubimage.c)
-add_executable (texture-al texture-al.c)
-add_executable (texture-rg texture-rg.c)
-add_executable (texwrap texwrap.c)
+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:
diff --git a/tests/texturing/shaders/CMakeLists.gl.txt b/tests/texturing/shaders/CMakeLists.gl.txt
index 6a2cbe9be..ac421dd94 100644
--- a/tests/texturing/shaders/CMakeLists.gl.txt
+++ b/tests/texturing/shaders/CMakeLists.gl.txt
@@ -12,5 +12,5 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
-add_executable (textureSize textureSize.c common.c)
-add_executable (texelFetch texelFetch.c common.c)
+piglit_add_executable (textureSize textureSize.c common.c)
+piglit_add_executable (texelFetch texelFetch.c common.c)
diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt
index b612f41d4..be3f46e83 100644
--- a/tests/util/CMakeLists.gl.txt
+++ b/tests/util/CMakeLists.gl.txt
@@ -30,7 +30,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	)
 
 	add_definitions ( -DUSE_GLX )
-	add_library (piglitglxutil
+	piglit_add_library (piglitglxutil
 		    piglit-shader.c
 		    piglit-shader-gl.c
 		    piglit-transform-feedback.c
@@ -47,7 +47,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	)
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
-add_library (piglitutil
+piglit_add_library (piglitutil
 	${UTIL_SOURCES}
 )
 
diff --git a/tests/util/CMakeLists.gles1.txt b/tests/util/CMakeLists.gles1.txt
index e4bbb3311..9e4263a7e 100644
--- a/tests/util/CMakeLists.gles1.txt
+++ b/tests/util/CMakeLists.gles1.txt
@@ -9,7 +9,7 @@ link_libraries(
 	glut_egl
 	)
 
-add_library(piglitutil_${piglit_target_api}
+piglit_add_library(piglitutil_${piglit_target_api}
 	${UTIL_SOURCES}
 )
 
diff --git a/tests/util/CMakeLists.gles2.txt b/tests/util/CMakeLists.gles2.txt
index 65d55a6d7..274ce4cc5 100644
--- a/tests/util/CMakeLists.gles2.txt
+++ b/tests/util/CMakeLists.gles2.txt
@@ -11,7 +11,7 @@ link_libraries(
 	glut_egl
 	)
 
-add_library(piglitutil_${piglit_target_api}
+piglit_add_library(piglitutil_${piglit_target_api}
 	${UTIL_SOURCES}
 )