Stop using ../../test_common to include common headers

Contributes to #395.

Signed-off-by: Kevin Petit <kevin.petit@arm.com>

test_common/gl/helpers.h

@@ -36,12 +36,12 @@
 #include "gl_headers.h"
 #endif
 
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/threadTesting.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/threadTesting.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/mt19937.h"
 
 typedef cl_mem
 (CL_API_CALL *clCreateFromGLBuffer_fn)(cl_context     context,

test_common/gl/setup_osx.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "setup.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/errorHelpers.h"
 #include <OpenGL/CGLDevice.h>
 
 class OSXGLEnvironment : public GLEnvironment

test_common/gl/setup_win32.cpp

@@ -17,7 +17,7 @@
 
 #include "setup.h"
 #include "testBase.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/errorHelpers.h"
 
 #include <GL/gl.h>
 #include <GL/glut.h>

test_common/gl/setup_x11.cpp

@@ -17,7 +17,7 @@
 
 #include "setup.h"
 #include "testBase.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/errorHelpers.h"
 
 #include <GL/gl.h>
 #include <GL/glut.h>

test_conformance/CMakeLists.txt

@@ -32,9 +32,9 @@ else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CTS_EXTRA_FLAGS}")
 endif()
 
-# Clang gives C++11 narrowing warnings so suppress these for now
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing")
+# Suppress narrowing warnings given by Clang and GCC
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Clang)|(GNU)")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing -Wno-narrowing")
 endif()
 
 if( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" )
@@ -43,6 +43,7 @@ if( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" )
 endif()
 
 include_directories(BEFORE SYSTEM ${CLConform_HEADERS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../test_common)
 link_directories(${CLConform_LIB_DIR})
 
 add_definitions(-DCL_TARGET_OPENCL_VERSION=120)

test_conformance/allocations/allocation_fill.cpp

@@ -18,7 +18,7 @@
 #define BUFFER_CHUNK_SIZE 8*1024*1024
 #define IMAGE_LINES 8
 
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 
 int fill_buffer_with_data(cl_context context, cl_device_id device_id, cl_command_queue *queue, cl_mem mem, size_t size, MTdata d, cl_bool blocking_write) {
      size_t i, j;

test_conformance/allocations/main.cpp

@@ -18,7 +18,7 @@
 #include "allocation_functions.h"
 #include "allocation_fill.h"
 #include "allocation_execute.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 #include <time.h>
 
 cl_device_id g_device_id;

test_conformance/allocations/testBase.h

@@ -32,10 +32,10 @@
 #include <unistd.h>
 #endif
 
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/testHarness.h"
 
 
 #define MAX_NUMBER_TO_ALLOCATE 100

test_conformance/api/main.c

@@ -23,7 +23,7 @@
 #include <math.h>
 #include <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>

test_conformance/api/procs.h

@@ -13,11 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/clImageHelper.h"
-#include "../../test_common/harness/imageHelpers.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/clImageHelper.h"
+#include "harness/imageHelpers.h"
 extern float    calculate_ulperror(float a, float b);
 
 extern int        test_load_single_kernel(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);

test_conformance/api/test_api_min_max.c

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/typeWrappers.h"
+#include "harness/testHarness.h"
 #include <ctype.h>
 #include <string.h>
 

test_conformance/api/test_bool.c

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 
 const char *kernel_with_bool[] = {

test_conformance/api/test_create_context_from_type.cpp

@@ -19,7 +19,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/api/test_create_kernels.c

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 
 const char *sample_single_kernel[] = {

test_conformance/api/test_device_min_data_type_align_size_alignment.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 #ifndef _WIN32
 #include <unistd.h>
 #endif

test_conformance/api/test_kernel_arg_multi_setup.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 // This test is designed to stress passing multiple vector parameters to kernels and verifying access between them all
 

test_conformance/api/test_kernels.c

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/api/test_mem_object_info.cpp

@@ -15,8 +15,8 @@
 //
 #include "testBase.h"
 #include "../images/image_helpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/typeWrappers.h"
+#include "harness/testHarness.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/api/test_native_kernel.cpp

@@ -19,7 +19,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/api/test_queries.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/imageHelpers.h"
+#include "harness/imageHelpers.h"
 #include <stdlib.h>
 #include <ctype.h>
 

test_conformance/api/test_queue_properties.cpp

@@ -16,12 +16,14 @@
 
 
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
 #include <sstream>
 #include <string>
 #include <vector>
 
+#include <CL/cl_ext.h>
+
 using namespace std;
 /*
 The test against cl_khr_create_command_queue extension. It validates if devices with Opencl 1.X can use clCreateCommandQueueWithPropertiesKHR function.
@@ -171,4 +173,4 @@ int test_queue_properties(cl_device_id deviceID, cl_context context, cl_command_
     }
 
     return 0;
-}
+}

test_conformance/api/test_retain_program.c

@@ -19,7 +19,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 
 int test_release_kernel_order(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
 {

test_conformance/atomics/main.c

@@ -23,7 +23,7 @@
 #include <math.h>
 #include <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>

test_conformance/atomics/procs.h

@@ -13,10 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/threadTesting.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/threadTesting.h"
+#include "harness/typeWrappers.h"
 
 extern int      create_program_and_kernel(const char *source, const char *kernel_name, cl_program *program_ret, cl_kernel *kernel_ret);
 

test_conformance/atomics/test_atomics.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 #ifndef _WIN32
 #include <unistd.h>
 #endif

test_conformance/atomics/test_indexed_cases.c

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/basic/main.c

@@ -26,7 +26,7 @@
 
 #include <math.h>
 #include <string.h>
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 #include "procs.h"
 
 basefn    basefn_list[] = {

test_conformance/basic/procs.h

@@ -13,12 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/rounding_mode.h"
+#include "harness/kernelHelpers.h"
+#include "harness/testHarness.h"
+#include "harness/errorHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/rounding_mode.h"
 
 extern void     memset_pattern4(void *dest, const void *src_pattern, size_t bytes );
 

test_conformance/basic/test_astype.cpp

@@ -33,8 +33,8 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
 
 
 static const char *astype_kernel_pattern =

test_conformance/basic/test_async_copy.cpp

@@ -28,7 +28,7 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 static const char *async_global_to_local_kernel =
 "%s\n" // optional pragma string

test_conformance/basic/test_async_strided_copy.cpp

@@ -28,7 +28,7 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 static const char *async_strided_global_to_local_kernel =
 "%s\n" // optional pragma string

test_conformance/basic/test_enqueue_map.cpp

@@ -27,8 +27,8 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
 
 const cl_mem_flags flag_set[] = {
   CL_MEM_ALLOC_HOST_PTR,

test_conformance/basic/test_explicit_s2v.cpp

@@ -27,8 +27,8 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
 
 #define DECLARE_S2V_IDENT_KERNEL(srctype,dsttype,size) \
 "__kernel void test_conversion(__global " srctype " *sourceValues, __global " dsttype #size " *destValues )\n"        \

test_conformance/basic/test_fpmath_float.c

@@ -24,7 +24,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "../../test_common/harness/rounding_mode.h"
+#include "harness/rounding_mode.h"
 
 #include "procs.h"
 

test_conformance/basic/test_fpmath_float2.c

@@ -24,7 +24,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "../../test_common/harness/rounding_mode.h"
+#include "harness/rounding_mode.h"
 
 
 #include "procs.h"

test_conformance/basic/test_fpmath_float4.c

@@ -27,7 +27,7 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/rounding_mode.h"
+#include "harness/rounding_mode.h"
 
 const char *fpadd4_kernel_code =
 "__kernel void test_fpadd4(__global float4 *srcA, __global float4 *srcB, __global float4 *dst)\n"

test_conformance/basic/test_image_param.c

@@ -27,9 +27,9 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/imageHelpers.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/imageHelpers.h"
+#include "harness/conversions.h"
 
 
 static const char *param_kernel[] = {

test_conformance/basic/test_kernel_memory_alignment.cpp

@@ -18,9 +18,9 @@
 #endif
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/errorHelpers.h"
 
 // For global, local, and constant
 const char *parameter_kernel_long =

test_conformance/basic/test_vec_type_hint.c

@@ -25,8 +25,8 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
 
 
 static const char *sample_kernel = {

test_conformance/basic/test_vector_creation.cpp

@@ -14,9 +14,9 @@
 // limitations under the License.
 //
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/errorHelpers.h"
 
 
 

test_conformance/basic/test_vloadstore.c

@@ -33,9 +33,9 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/errorHelpers.h"
 
 // Outputs debug information for stores
 #define DEBUG 0

test_conformance/basic/test_work_item_functions.cpp

@@ -27,8 +27,8 @@
 
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
 
 typedef struct work_item_data
 {

test_conformance/buffers/main.c

@@ -19,7 +19,7 @@
 #include <math.h>
 #include <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 basefn  bufferfn_list[] = {
     test_buffer_read_async_int,

test_conformance/buffers/procs.h

@@ -16,12 +16,12 @@
 #ifndef __PROCS_H__
 #define __PROCS_H__
 
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/mt19937.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/kernelHelpers.h"
+#include "harness/testHarness.h"
+#include "harness/errorHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/mt19937.h"
+#include "harness/conversions.h"
 
 #ifndef __APPLE__
 #include <CL/cl.h>

test_conformance/buffers/test_buffer_copy.c

@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/errorHelpers.h"
 
 
 static int verify_copy_buffer(int *inptr, int *outptr, int n)

test_conformance/buffers/test_buffer_fill.c

@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/errorHelpers.h"
 
 #define USE_LOCAL_WORK_GROUP    1
 

test_conformance/buffers/test_buffer_map.c

@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/errorHelpers.h"
 
 
 #define TEST_PRIME_INT        ((1<<16)+1)

test_conformance/buffers/test_buffer_migrate.c

@@ -17,8 +17,8 @@
 #include <stdlib.h>
 
 #include "procs.h"
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/errorHelpers.h"
+#include "harness/testHarness.h"
 
 #define MAX_SUB_DEVICES        16        // Limit the sub-devices to ensure no out of resource errors.
 #define BUFFER_SIZE        1024

test_conformance/buffers/test_buffer_write.c

@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/errorHelpers.h"
 
 #define USE_LOCAL_WORK_GROUP    1
 

test_conformance/buffers/test_image_migrate.c

@@ -17,7 +17,7 @@
 #include <stdlib.h>
 
 #include "procs.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/errorHelpers.h"
 
 #define MAX_SUB_DEVICES        16        // Limit the sub-devices to ensure no out of resource errors.
 #define MEM_OBJ_SIZE          1024

test_conformance/commonfns/main.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include "procs.h"
 
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 
 int g_arrVecSizes[kVectorSizeCount + kStrangeVectorSizeCount];
 int g_arrStrangeVectorSizes[kStrangeVectorSizeCount] = {3};

test_conformance/commonfns/procs.h

@@ -13,11 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/testHarness.h"
+#include "harness/kernelHelpers.h"
+#include "harness/errorHelpers.h"
+#include "harness/conversions.h"
+#include "harness/mt19937.h"
 
 #define kVectorSizeCount 5
 #define kStrangeVectorSizeCount 1

test_conformance/commonfns/test_clamp.c

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 
 #include <stdio.h>
 #include <stdlib.h>

test_conformance/commonfns/test_minf.c

@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/errorHelpers.h"
 
 static int min_verify_float( float *x, float *y, float *out, int numElements, int vecSize )
 {

test_conformance/compiler/main.c

@@ -23,7 +23,7 @@
 #include <math.h>
 #include <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>

test_conformance/compiler/procs.h

@@ -13,11 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/mt19937.h"
 
 extern int        test_load_program_source(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
 extern int        test_load_multistring_source(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);

test_conformance/compiler/test_compile.c

@@ -20,7 +20,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 extern cl_uint gRandomSeed;
 

test_conformance/computeinfo/main.c

@@ -17,8 +17,8 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
 
 typedef struct
 {

test_conformance/contractions/CMakeLists.txt

@@ -1,5 +1,3 @@
-include_directories(../../test_common/harness)
-
 add_executable(conformance_test_contractions
         contractions.c
         ../../test_common/harness/mt19937.c

test_conformance/contractions/contractions.c

@@ -30,17 +30,17 @@
 #include <sys/param.h>
 #endif
 
-#include "mingw_compat.h"
+#include "harness/mingw_compat.h"
 #if defined (__MINGW32__)
 #include <sys/param.h>
 #endif
 
 #include <time.h>
-#include "errorHelpers.h"
-#include "../../test_common/harness/mt19937.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/rounding_mode.h"
-#include "../../test_common/harness/fpcontrol.h"
+#include "harness/errorHelpers.h"
+#include "harness/mt19937.h"
+#include "harness/kernelHelpers.h"
+#include "harness/rounding_mode.h"
+#include "harness/fpcontrol.h"
 #if defined( __APPLE__ )
 #include <sys/sysctl.h>
 #endif
@@ -51,7 +51,7 @@
 #endif
 
 #if defined (_WIN32)
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 #include <string.h>
 #endif
 

test_conformance/conversions/CMakeLists.txt

@@ -7,8 +7,6 @@ set(CMAKE_C_FLAGS_RELEASE "-O0")
 set(CMAKE_CXX_FLAGS_RELEASE "-O0")
 endif(MSVC)
 
-include_directories(../../test_common/harness)
-
 add_executable(conformance_test_conversions
         Sleep.c test_conversions.c basic_test_conversions.c
         ../../test_common/harness/ThreadPool.c

test_conformance/conversions/basic_test_conversions.c

@@ -20,8 +20,8 @@
 #include <string.h>
 #include <float.h>
 
-#include "../../test_common/harness/compat.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/compat.h"
+#include "harness/mt19937.h"
 
 static inline cl_ulong random64( MTdata d );
 

test_conformance/conversions/basic_test_conversions.h

@@ -21,9 +21,9 @@
 #include <stdint.h>
 #endif
 
-#include "../../test_common/harness/compat.h"
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/rounding_mode.h"
+#include "harness/compat.h"
+#include "harness/errorHelpers.h"
+#include "harness/rounding_mode.h"
 
 #include <stdio.h>
 #if defined( __APPLE__ )
@@ -32,7 +32,7 @@
     #include <CL/opencl.h>
 #endif
 
-#include "../../test_common/harness/mt19937.h"
+#include "harness/mt19937.h"
 
 typedef void (*Convert)( void *dest, void *src, size_t );
 

test_conformance/conversions/test_conversions.c

@@ -13,10 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/compat.h"
-#include "../../test_common/harness/rounding_mode.h"
-#include "../../test_common/harness/ThreadPool.h"
-#include "../../test_common/harness/parseParameters.h"
+#include "harness/compat.h"
+#include "harness/rounding_mode.h"
+#include "harness/ThreadPool.h"
+#include "harness/parseParameters.h"
 #if defined (_WIN32)
 #define MAX(x,y) ((x>y)?x:y);
 #define MIN(x,y) ((x<y)?x:y);
@@ -35,7 +35,7 @@
 #include <libgen.h>
 #endif
 
-#include "mingw_compat.h"
+#include "harness/mingw_compat.h"
 #if defined(__MINGW32__)
 #include <sys/param.h>
 #endif
@@ -66,7 +66,7 @@
 #if (defined(_WIN32) && defined (_MSC_VER))
 // need for _controlfp_s and rouinding modes in RoundingMode
 #include <float.h>
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 #endif
 
 #pragma mark -

test_conformance/d3d10/CMakeLists.txt

@@ -11,8 +11,7 @@ set(D3D10_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x64)
 endif(${ARCH} STREQUAL "x86_64")
 
 list(APPEND CLConform_INCLUDE_DIR ${D3D10_INCLUDE_DIR})
-include_directories (${CLConform_SOURCE_DIR}/test_common/harness
-                     ${CLConform_INCLUDE_DIR} )
+include_directories (${CLConform_INCLUDE_DIR})
 link_directories(${CL_LIB_DIR}, ${D3D10_LIB_DIR})
 
 list(APPEND CLConform_LIBRARIES d3d10 dxgi)

test_conformance/d3d11/CMakeLists.txt

@@ -11,8 +11,7 @@ set(D3D11_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x64)
 endif(${ARCH} STREQUAL "x86_64")
 
 list(APPEND CLConform_INCLUDE_DIR ${D3D11_INCLUDE_DIR})
-include_directories (${CLConform_SOURCE_DIR}/test_common/harness
-                     ${CLConform_INCLUDE_DIR} )
+include_directories (${CLConform_INCLUDE_DIR})
 link_directories(${CL_LIB_DIR}, ${D3D11_LIB_DIR})
 
 list(APPEND CLConform_LIBRARIES d3d11 dxgi)

test_conformance/device_partition/main.c

@@ -23,8 +23,8 @@
 #include <math.h>
 #include <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/testHarness.h"
+#include "harness/mt19937.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>

test_conformance/device_partition/procs.h

@@ -13,10 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/mt19937.h"
 
 extern int      test_partition(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
 extern int      test_partition_equally(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);

test_conformance/device_partition/test_device_partition.cpp

@@ -14,9 +14,9 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/testHarness.h"
+#include "harness/conversions.h"
 
 const char *test_kernels[] = {
 "__kernel void kernelA(__global int *dst)\n"

test_conformance/events/main.c

@@ -21,7 +21,7 @@
 #include <math.h>
 #include <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif

test_conformance/events/procs.h

@@ -13,10 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/clImageHelper.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/clImageHelper.h"
 
 extern float    random_float(float low, float high);
 extern float    calculate_ulperror(float a, float b);

test_conformance/events/test_callbacks.cpp

@@ -15,8 +15,8 @@
 //
 #include "testBase.h"
 #include "action_classes.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/ThreadPool.h"
+#include "harness/conversions.h"
+#include "harness/ThreadPool.h"
 
 #if !defined (_MSC_VER)
 #include <unistd.h>

test_conformance/events/test_event_dependencies.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 const char *write_kernels[] = {
     "__kernel void write_up(__global int *dst, int length)\n"

test_conformance/events/test_userevents_multithreaded.cpp

@@ -15,8 +15,8 @@
 //
 #include "testBase.h"
 #include "action_classes.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/genericThread.h"
+#include "harness/conversions.h"
+#include "harness/genericThread.h"
 
 #if !defined (_MSC_VER)
     #include <unistd.h>

test_conformance/geometrics/main.c

@@ -21,7 +21,7 @@
 #include <math.h>
 #include <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif

test_conformance/geometrics/procs.h

@@ -13,10 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/threadTesting.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/threadTesting.h"
+#include "harness/typeWrappers.h"
 
 extern const unsigned int g_vecSizeof[];
 

test_conformance/geometrics/test_geometrics.cpp

@@ -13,13 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 
 #include "testBase.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/testHarness.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/errorHelpers.h"
 #include <float.h>
 
 const char *crossKernelSource =

test_conformance/geometrics/test_geometrics_double.cpp

@@ -14,9 +14,9 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/errorHelpers.h"
 
 const char *crossKernelSource_double =
 "#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n"

test_conformance/gl/main.cpp

@@ -28,8 +28,8 @@
 #endif
 
 #include "procs.h"
-#include "../../test_common/gl/setup.h"
-#include "../../test_common/harness/testHarness.h"
+#include "gl/setup.h"
+#include "harness/testHarness.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>

test_conformance/gl/procs.h

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/mt19937.h"
 
 
 #pragma mark -

test_conformance/gl/testBase.h

@@ -30,20 +30,20 @@
 
 #if !defined (__APPLE__)
 #include <CL/cl.h>
-#include "../../test_common/gl/gl_headers.h"
+#include "gl/gl_headers.h"
 #include <CL/cl_gl.h>
 #else
-#include "../../test_common/gl/gl_headers.h"
+#include "gl/gl_headers.h"
 #endif
 
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/threadTesting.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/threadTesting.h"
+#include "harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/mt19937.h"
 
-#include "../../test_common/gl/helpers.h"
+#include "gl/helpers.h"
 #include "../images/image_helpers.h"
 
 extern const char *get_kernel_suffix( cl_image_format *format );

test_conformance/gl/test_buffers.cpp

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
 #include <math.h>
 #include <float.h>
 

test_conformance/gl/test_fence_sync.cpp

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/gl/setup.h"
-#include "../../test_common/harness/genericThread.h"
+#include "gl/setup.h"
+#include "harness/genericThread.h"
 
 #if defined( __APPLE__ )
 #include <OpenGL/glu.h>

test_conformance/half/cl_utils.h

@@ -29,8 +29,8 @@
 #include <sys/param.h>
 #endif
 
-#include "../../test_common/harness/compat.h"
-#include "../../test_common/harness/errorHelpers.h"
+#include "harness/compat.h"
+#include "harness/errorHelpers.h"
 
 #if defined (_WIN32)
 #define MAX(x,y) ((x>y)?x:y);

test_conformance/half/main.c

@@ -24,8 +24,8 @@
 #include <sys/param.h>
 #endif
 
-#include "../../test_common/harness/mingw_compat.h"
-#include "../../test_common/harness/parseParameters.h"
+#include "harness/mingw_compat.h"
+#include "harness/parseParameters.h"
 #if defined (__MINGW32__)
 #include <sys/param.h>
 #endif

test_conformance/images/image_helpers.h

@@ -34,14 +34,14 @@
 
 #include <time.h>
 
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/imageHelpers.h"
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/mt19937.h"
-#include "../../test_common/harness/rounding_mode.h"
-#include "../../test_common/harness/clImageHelper.h"
+#include "harness/conversions.h"
+#include "harness/typeWrappers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/imageHelpers.h"
+#include "harness/errorHelpers.h"
+#include "harness/mt19937.h"
+#include "harness/rounding_mode.h"
+#include "harness/clImageHelper.h"
 
 extern int gTestCount;
 extern int gTestFailure;

test_conformance/images/kernel_read_write/main.cpp

@@ -29,7 +29,7 @@
 #endif
 
 #include "../testBase.h"
-#include "../../../test_common/harness/fpcontrol.h"
+#include "harness/fpcontrol.h"
 
 #if defined(__PPC__)
 // Global varaiable used to hold the FPU control register state. The FPSCR register can not

test_conformance/images/samplerlessReads/main.cpp

@@ -29,7 +29,7 @@
 #endif
 
 #include "../testBase.h"
-#include "../../../test_common/harness/fpcontrol.h"
+#include "harness/fpcontrol.h"
 
 #if defined(__PPC__)
 // Global varaiable used to hold the FPU control register state. The FPSCR register can not

test_conformance/images/testBase.h

@@ -16,9 +16,9 @@
 #ifndef _testBase_h
 #define _testBase_h
 
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/clImageHelper.h"
+#include "harness/testHarness.h"
+#include "harness/kernelHelpers.h"
+#include "harness/clImageHelper.h"
 
 #include "image_helpers.h"
 

test_conformance/integer_ops/main.c

@@ -23,7 +23,7 @@
 #include <math.h>
 #include <string.h>
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>

test_conformance/integer_ops/procs.h

@@ -13,12 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "../../test_common/harness/errorHelpers.h"
-#include "../../test_common/harness/kernelHelpers.h"
-#include "../../test_common/harness/threadTesting.h"
-#include "../../test_common/harness/typeWrappers.h"
-#include "../../test_common/harness/testHarness.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/errorHelpers.h"
+#include "harness/kernelHelpers.h"
+#include "harness/threadTesting.h"
+#include "harness/typeWrappers.h"
+#include "harness/testHarness.h"
+#include "harness/mt19937.h"
 
 
 // The number of errors to print out for each test

test_conformance/integer_ops/test_int_basic_ops.c

@@ -26,8 +26,8 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
-#include "../../test_common/harness/ThreadPool.h"
+#include "harness/conversions.h"
+#include "harness/ThreadPool.h"
 
 #define NUM_TESTS 23
 

test_conformance/integer_ops/test_integers.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 #define TEST_SIZE 512
 

test_conformance/integer_ops/test_unary_ops.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 #define TEST_SIZE 512
 

test_conformance/integer_ops/test_upsample.cpp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 #include "testBase.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 static const int vector_sizes[] = {1, 2, 3, 4, 8, 16};
 #define NUM_VECTOR_SIZES 6

test_conformance/integer_ops/verification_and_generation_functions.c

@@ -26,7 +26,7 @@
 #include <sys/stat.h>
 
 #include "procs.h"
-#include "../../test_common/harness/conversions.h"
+#include "harness/conversions.h"
 
 extern     MTdata          d;
 

test_conformance/math_brute_force/FunctionList.h

@@ -27,8 +27,8 @@
     #include <CL/cl.h>
 #endif
 
-#include "../../test_common/harness/compat.h"
-#include "../../test_common/harness/mt19937.h"
+#include "harness/compat.h"
+#include "harness/mt19937.h"
 
 #ifdef __cplusplus
 extern "C" {

test_conformance/math_brute_force/Utility.h

@@ -16,7 +16,7 @@
 #ifndef UTILITY_H
 #define UTILITY_H
 
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 #ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #else
@@ -27,15 +27,15 @@
 #include <stdint.h>
 #endif
 
-#include "../../test_common/harness/rounding_mode.h"
-#include "../../test_common/harness/fpcontrol.h"
+#include "harness/rounding_mode.h"
+#include "harness/fpcontrol.h"
 
 #if defined( _WIN32) && defined (_MSC_VER)
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 #endif
 
 
-#include "../../test_common/harness/ThreadPool.h"
+#include "harness/ThreadPool.h"
 #define BUFFER_SIZE         (1024*1024*2)
 
 #if defined( __GNUC__ )

test_conformance/math_brute_force/reference_math.c

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include "../../test_common/harness/compat.h"
+#include "harness/compat.h"
 #include "reference_math.h"
 #include <limits.h>
 

test_conformance/mem_host_flags/main.cpp

@@ -28,7 +28,7 @@
 #endif
 
 #include "procs.h"
-#include "../../test_common/harness/testHarness.h"
+#include "harness/testHarness.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>