don't write generated header to the source directory

It was impossible to have the source directory read-only.

Also add the include_directories() directive for tests/util
in just one place, under tests/, so that all subdirectories
inherit it. A bunch of CMakeLists.txt files duplicate it,
so delete those redundant include flags:

sed -i -e "/^\t\${piglit_SOURCE_DIR}\/tests\/util/ d" \
 `grep piglit_SOURCE_DIR -rl tests/ | grep "CMakeLists\.gl"`

68 files changed, 8 insertions, 67 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4b5b2a0c..7c31173e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,7 @@ check_include_file(fcntl.h     HAVE_FCNTL_H)
 
 configure_file(
 	"${piglit_SOURCE_DIR}/tests/util/config.h.in"
-	"${piglit_SOURCE_DIR}/tests/util/config.h"
+	"${piglit_BINARY_DIR}/tests/util/config.h"
 )
 
 include_directories(src)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 52d16d4a9..1a53693b4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,8 @@
+include_directories(
+	${piglit_BINARY_DIR}/tests/util
+	${piglit_SOURCE_DIR}/tests/util
+)
+
 add_subdirectory (util)
 add_subdirectory (bugs)
 add_subdirectory (fbo)
diff --git a/tests/asmparsertest/CMakeLists.gl.txt b/tests/asmparsertest/CMakeLists.gl.txt
index d8c0007fe..9ad43c56a 100644
--- a/tests/asmparsertest/CMakeLists.gl.txt
+++ b/tests/asmparsertest/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index 5c1864e02..df621f216 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
index 1cea990f7..32591a909 100644
--- a/tests/egl/CMakeLists.gl.txt
+++ b/tests/egl/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt
index f35514430..44015a1c4 100644
--- a/tests/fbo/CMakeLists.gl.txt
+++ b/tests/fbo/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
index 12e2f9e52..95f8819cc 100644
--- a/tests/general/CMakeLists.gl.txt
+++ b/tests/general/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/gles2/CMakeLists.gles2.txt b/tests/gles2/CMakeLists.gles2.txt
index 224ab633a..db23f3178 100644
--- a/tests/gles2/CMakeLists.gles2.txt
+++ b/tests/gles2/CMakeLists.gles2.txt
@@ -2,7 +2,6 @@
 
 include_directories(
 	${OPENGL_INCLUDE_PATH}
-	${piglit_SOURCE_DIR}/tests/util/
 	)
 
 link_libraries(
diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
index c20bec741..789d84f92 100644
--- a/tests/glx/CMakeLists.gl.txt
+++ b/tests/glx/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/hiz/CMakeLists.gl.txt b/tests/hiz/CMakeLists.gl.txt
index 832c47537..a64295ade 100644
--- a/tests/hiz/CMakeLists.gl.txt
+++ b/tests/hiz/CMakeLists.gl.txt
@@ -1,6 +1,5 @@
 include_directories(
 	${piglit_SOURCE_DIR}/tests
-	${piglit_SOURCE_DIR}/tests/util
 
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
diff --git a/tests/mesa/util/CMakeLists.gl.txt b/tests/mesa/util/CMakeLists.gl.txt
index 4af71efbb..066a01bc5 100644
--- a/tests/mesa/util/CMakeLists.gl.txt
+++ b/tests/mesa/util/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories (
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${PNG_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 link_libraries (
 	piglitutil
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 9d7226078..8e090d868 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
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 b6a6381e4..7b006d4f8 100644
--- a/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
+++ b/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
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 a6a106705..b835e91ac 100644
--- a/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
+++ b/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
index f01bb02f6..67c3efc14 100644
--- a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
index a1d1f6234..d037b7fbf 100644
--- a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
+++ b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_debug_output/CMakeLists.gl.txt b/tests/spec/arb_debug_output/CMakeLists.gl.txt
index ad2e74964..cc7ccddd6 100644
--- a/tests/spec/arb_debug_output/CMakeLists.gl.txt
+++ b/tests/spec/arb_debug_output/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
index 81b92302d..bd4fa9b1a 100644
--- a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
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 07d47e7c8..cb5daf7a0 100644
--- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
index 72151348a..10e8c9e49 100644
--- a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
+++ b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_fragment_program/CMakeLists.gl.txt b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
index 9fa4a2f29..6c1099d4c 100644
--- a/tests/spec/arb_fragment_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
index 3b9fec3cc..c46f5ff19 100644
--- a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
index 03aa0d8d2..858eaa79d 100644
--- a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
+++ b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
index c595d47fc..24d50a596 100644
--- a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
+++ b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_multisample/CMakeLists.gl.txt b/tests/spec/arb_multisample/CMakeLists.gl.txt
index 9ed8636bb..db1c966af 100644
--- a/tests/spec/arb_multisample/CMakeLists.gl.txt
+++ b/tests/spec/arb_multisample/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_robustness/CMakeLists.gl.txt b/tests/spec/arb_robustness/CMakeLists.gl.txt
index 1d939baad..a7e1a21cf 100644
--- a/tests/spec/arb_robustness/CMakeLists.gl.txt
+++ b/tests/spec/arb_robustness/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_robustness
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
index 4e3a84a05..41804d5d6 100644
--- a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
index 5cdc8c6ad..6b5dc5950 100644
--- a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
+++ b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_shader_objects/CMakeLists.gl.txt b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
index 26b4682c2..c8ba5c19a 100644
--- a/tests/spec/arb_shader_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
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 163d96492..20282f5e2 100644
--- a/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_texture_compression/CMakeLists.gl.txt b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
index 5a9040dab..d970c1213 100644
--- a/tests/spec/arb_texture_compression/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_texture_float/CMakeLists.gl.txt b/tests/spec/arb_texture_float/CMakeLists.gl.txt
index c3a4684ba..1e819dd1c 100644
--- a/tests/spec/arb_texture_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_float/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_texture_storage/CMakeLists.gl.txt b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
index d2fb99985..f942756c7 100644
--- a/tests/spec/arb_texture_storage/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
index 32b9a702c..ac12fcd73 100644
--- a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
+++ b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
index cacc0b7b2..b81a32b09 100644
--- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/arb_vertex_program/CMakeLists.gl.txt b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
index 2b265c30a..7acb75bc7 100644
--- a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
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 3bb8b9572..7cc967a6a 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
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
index c138bd965..16ce10c96 100644
--- a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
index 6f3b342fc..1d97f5be2 100644
--- a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
+++ b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ext_fog_coord/CMakeLists.gl.txt b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
index 755ba2c5f..7bc722aab 100644
--- a/tests/spec/ext_fog_coord/CMakeLists.gl.txt
+++ b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index 1f5edf93a..ec7226192 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
index 7fd1cc12c..a0fc8a1d6 100644
--- a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ext_packed_float/CMakeLists.gl.txt b/tests/spec/ext_packed_float/CMakeLists.gl.txt
index c6ff3746e..9da52cd78 100644
--- a/tests/spec/ext_packed_float/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_float/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ext_texture_array/CMakeLists.gl.txt b/tests/spec/ext_texture_array/CMakeLists.gl.txt
index 9c1125e96..9238694ff 100644
--- a/tests/spec/ext_texture_array/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_array/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ext_texture_integer/CMakeLists.gl.txt b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
index d425728a4..3fd7132e5 100644
--- a/tests/spec/ext_texture_integer/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ext_timer_query/CMakeLists.gl.txt b/tests/spec/ext_timer_query/CMakeLists.gl.txt
index 68f055155..345947f7e 100644
--- a/tests/spec/ext_timer_query/CMakeLists.gl.txt
+++ b/tests/spec/ext_timer_query/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
index 7f4b18913..8436db27c 100644
--- a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
+++ b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/gl-2.0/CMakeLists.gl.txt b/tests/spec/gl-2.0/CMakeLists.gl.txt
index bc771e7eb..e712e12fb 100644
--- a/tests/spec/gl-2.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/gl-2.0/api/CMakeLists.gl.txt b/tests/spec/gl-2.0/api/CMakeLists.gl.txt
index 235be7349..5db44dca4 100644
--- a/tests/spec/gl-2.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/api/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/gl-2.1/CMakeLists.gl.txt b/tests/spec/gl-2.1/CMakeLists.gl.txt
index 9a4afbe12..ab8c53ae6 100644
--- a/tests/spec/gl-2.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.1/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/gl-3.0/CMakeLists.gl.txt b/tests/spec/gl-3.0/CMakeLists.gl.txt
index 5f44d23bf..42d17ae28 100644
--- a/tests/spec/gl-3.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/gl-3.0/api/CMakeLists.gl.txt b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
index 433dc3713..d3025f569 100644
--- a/tests/spec/gl-3.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
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 1e611c4e8..68f94a971 100644
--- a/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
index 273ed11c3..f81cb73b9 100644
--- a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/glsl-1.30/CMakeLists.gl.txt b/tests/spec/glsl-1.30/CMakeLists.gl.txt
index 3ddd1371a..02d3a8656 100644
--- a/tests/spec/glsl-1.30/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
index 8714e2a8f..9da7eacbd 100644
--- a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
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 aae66ee89..8f5198562 100644
--- a/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
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 28c9e0028..150dd979c 100644
--- a/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
index 3b70207c6..1d004c48a 100644
--- a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
index 2ba2acd0f..52f147102 100644
--- a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/nv_conditional_render/CMakeLists.gl.txt b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
index 175c5aa27..b3db9fd85 100644
--- a/tests/spec/nv_conditional_render/CMakeLists.gl.txt
+++ b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
index 96d692509..5f7a40b43 100644
--- a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
+++ b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
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 da31a40d6..ff94a5468 100644
--- a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt
+++ b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries(
diff --git a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
index eed856bd6..ab37b2f61 100644
--- a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
+++ b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries(
diff --git a/tests/spec/oes_draw_texture/CMakeLists.gles1.txt b/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
index 2442844e9..e68bc7289 100644
--- a/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
+++ b/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
@@ -2,7 +2,6 @@
 
 include_directories(
 	${OPENGL_INCLUDE_PATH}
-	${piglit_SOURCE_DIR}/tests/util/
 	)
 
 link_libraries(
diff --git a/tests/texturing/CMakeLists.gl.txt b/tests/texturing/CMakeLists.gl.txt
index 6e12cc016..8720ed0f6 100644
--- a/tests/texturing/CMakeLists.gl.txt
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/texturing/shaders/CMakeLists.gl.txt b/tests/texturing/shaders/CMakeLists.gl.txt
index 467ac19be..6a2cbe9be 100644
--- a/tests/texturing/shaders/CMakeLists.gl.txt
+++ b/tests/texturing/shaders/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )
 
 link_libraries (
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 96964d66b..9fe980683 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -2,7 +2,8 @@ add_definitions(-DSOURCE_DIR="${piglit_SOURCE_DIR}/")
 
 include_directories(
 	${OPENGL_INCLUDE_PATH}
-	${piglit_SOURCE_DIR}/tests/util
+	${CMAKE_CURRENT_BINARY_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")