diff --git a/CMakeLists.txt b/CMakeLists.txt index c0242c6a..441a7f90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,7 @@ include_directories(SYSTEM ${OPENCL_INCLUDE_DIR}) include_directories(${CLConform_SOURCE_DIR}/test_common/harness ${CLConform_SOURCE_DIR}/test_common/gles ${CLConform_SOURCE_DIR}/test_common/gl - ${CMAKE_CURRENT_SOURCE_DIR}/test_common/harness) + ${CLConform_SOURCE_DIR}/test_common) if(CMAKE_BUILD_TYPE STREQUAL "release") set (BUILD_FLAVOR "release") diff --git a/test_common/gl/helpers.h b/test_common/gl/helpers.h index ace1d16a..084c434a 100644 --- a/test_common/gl/helpers.h +++ b/test_common/gl/helpers.h @@ -32,12 +32,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, diff --git a/test_common/gl/setup_osx.cpp b/test_common/gl/setup_osx.cpp index 01641be0..8abddeda 100644 --- a/test_common/gl/setup_osx.cpp +++ b/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 class OSXGLEnvironment : public GLEnvironment diff --git a/test_common/gl/setup_win32.cpp b/test_common/gl/setup_win32.cpp index 1c7b4b2f..62307dcb 100644 --- a/test_common/gl/setup_win32.cpp +++ b/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 #include diff --git a/test_common/gl/setup_x11.cpp b/test_common/gl/setup_x11.cpp index 22bc7eed..c21e99f4 100644 --- a/test_common/gl/setup_x11.cpp +++ b/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 #include diff --git a/test_common/gles/helpers.h b/test_common/gles/helpers.h index 95faae12..5bd0fdf1 100644 --- a/test_common/gles/helpers.h +++ b/test_common/gles/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, diff --git a/test_conformance/SVM/common.h b/test_conformance/SVM/common.h index bbf5b5b6..904947c1 100644 --- a/test_conformance/SVM/common.h +++ b/test_conformance/SVM/common.h @@ -16,11 +16,11 @@ #ifndef __COMMON_H__ #define __COMMON_H__ -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/compat.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/typeWrappers.h" #if (defined(_WIN32) || defined(_WIN64)) && defined(_MSC_VER) #include diff --git a/test_conformance/SVM/main.cpp b/test_conformance/SVM/main.cpp index 3c888bd1..c6b17210 100644 --- a/test_conformance/SVM/main.cpp +++ b/test_conformance/SVM/main.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 #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/kernelHelpers.h" +#include "harness/testHarness.h" +#include "harness/kernelHelpers.h" #include "common.h" diff --git a/test_conformance/SVM/test_enqueue_api.cpp b/test_conformance/SVM/test_enqueue_api.cpp index 0f778cdc..d36e2561 100644 --- a/test_conformance/SVM/test_enqueue_api.cpp +++ b/test_conformance/SVM/test_enqueue_api.cpp @@ -14,7 +14,7 @@ // limitations under the License. // #include "common.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/mt19937.h" #include #include diff --git a/test_conformance/SVM/test_migrate.cpp b/test_conformance/SVM/test_migrate.cpp index 60ed9f6e..3a39eaea 100644 --- a/test_conformance/SVM/test_migrate.cpp +++ b/test_conformance/SVM/test_migrate.cpp @@ -14,7 +14,7 @@ // limitations under the License. // #include "common.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/mt19937.h" #define GLOBAL_SIZE 65536 diff --git a/test_conformance/allocations/allocation_fill.cpp b/test_conformance/allocations/allocation_fill.cpp index 92d813c3..a7558942 100644 --- a/test_conformance/allocations/allocation_fill.cpp +++ b/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; diff --git a/test_conformance/allocations/main.cpp b/test_conformance/allocations/main.cpp index 1d842f19..342f2f60 100644 --- a/test_conformance/allocations/main.cpp +++ b/test_conformance/allocations/main.cpp @@ -18,8 +18,8 @@ #include "allocation_functions.h" #include "allocation_fill.h" #include "allocation_execute.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/testHarness.h" +#include "harness/parseParameters.h" #include typedef long long unsigned llu; diff --git a/test_conformance/allocations/testBase.h b/test_conformance/allocations/testBase.h index 6a6e07ee..b48efe51 100644 --- a/test_conformance/allocations/testBase.h +++ b/test_conformance/allocations/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include #include @@ -28,10 +28,10 @@ #include #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 diff --git a/test_conformance/api/main.c b/test_conformance/api/main.c index f03b4615..d72f53f7 100644 --- a/test_conformance/api/main.c +++ b/test_conformance/api/main.c @@ -13,19 +13,19 @@ // 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 #include #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include #endif -// FIXME: To use certain functions in ../../test_common/harness/imageHelpers.h +// FIXME: To use certain functions in harness/imageHelpers.h // (for example, generate_random_image_data()), the tests are required to declare // the following variables (): cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT; diff --git a/test_conformance/api/procs.h b/test_conformance/api/procs.h index 4dd398dd..4c558040 100644 --- a/test_conformance/api/procs.h +++ b/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); diff --git a/test_conformance/api/testBase.h b/test_conformance/api/testBase.h index 8d58eeb6..ba67d140 100644 --- a/test_conformance/api/testBase.h +++ b/test_conformance/api/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include #include diff --git a/test_conformance/api/test_api_min_max.c b/test_conformance/api/test_api_min_max.c index 89b34c1d..a4f0bf02 100644 --- a/test_conformance/api/test_api_min_max.c +++ b/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 #include diff --git a/test_conformance/api/test_bool.c b/test_conformance/api/test_bool.c index 30b15b3e..2702fd02 100644 --- a/test_conformance/api/test_bool.c +++ b/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[] = { diff --git a/test_conformance/api/test_clone_kernel.cpp b/test_conformance/api/test_clone_kernel.cpp index 5826d7dc..e810f94b 100644 --- a/test_conformance/api/test_clone_kernel.cpp +++ b/test_conformance/api/test_clone_kernel.cpp @@ -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" #include #include #include diff --git a/test_conformance/api/test_create_context_from_type.cpp b/test_conformance/api/test_create_context_from_type.cpp index 4f560148..760542d3 100644 --- a/test_conformance/api/test_create_context_from_type.cpp +++ b/test_conformance/api/test_create_context_from_type.cpp @@ -14,13 +14,13 @@ // limitations under the License. // #include "testBase.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #ifndef _WIN32 #include #endif -#include "../../test_common/harness/conversions.h" +#include "harness/conversions.h" extern cl_uint gRandomSeed; diff --git a/test_conformance/api/test_create_kernels.c b/test_conformance/api/test_create_kernels.c index ceb18732..0f25f582 100644 --- a/test_conformance/api/test_create_kernels.c +++ b/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[] = { diff --git a/test_conformance/api/test_device_min_data_type_align_size_alignment.cpp b/test_conformance/api/test_device_min_data_type_align_size_alignment.cpp index 4a742205..0115a2bc 100644 --- a/test_conformance/api/test_device_min_data_type_align_size_alignment.cpp +++ b/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 #endif diff --git a/test_conformance/api/test_kernel_arg_multi_setup.cpp b/test_conformance/api/test_kernel_arg_multi_setup.cpp index 89c5eeb1..dbf2eed6 100644 --- a/test_conformance/api/test_kernel_arg_multi_setup.cpp +++ b/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 diff --git a/test_conformance/api/test_kernels.c b/test_conformance/api/test_kernels.c index 6daaabee..287adaeb 100644 --- a/test_conformance/api/test_kernels.c +++ b/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; diff --git a/test_conformance/api/test_mem_object_info.cpp b/test_conformance/api/test_mem_object_info.cpp index 85069a54..7f56f388 100644 --- a/test_conformance/api/test_mem_object_info.cpp +++ b/test_conformance/api/test_mem_object_info.cpp @@ -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" extern cl_uint gRandomSeed; diff --git a/test_conformance/api/test_native_kernel.cpp b/test_conformance/api/test_native_kernel.cpp index 2d52134b..49a13f94 100644 --- a/test_conformance/api/test_native_kernel.cpp +++ b/test_conformance/api/test_native_kernel.cpp @@ -19,7 +19,7 @@ #include #endif -#include "../../test_common/harness/conversions.h" +#include "harness/conversions.h" extern cl_uint gRandomSeed; diff --git a/test_conformance/api/test_null_buffer_arg.c b/test_conformance/api/test_null_buffer_arg.c index b845fc0b..4fa046b6 100644 --- a/test_conformance/api/test_null_buffer_arg.c +++ b/test_conformance/api/test_null_buffer_arg.c @@ -22,8 +22,8 @@ #include #endif #include "testBase.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/typeWrappers.h" +#include "harness/testHarness.h" #include "procs.h" diff --git a/test_conformance/api/test_queries.cpp b/test_conformance/api/test_queries.cpp index 0d412a0d..b1a07a31 100644 --- a/test_conformance/api/test_queries.cpp +++ b/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 #include diff --git a/test_conformance/api/test_queue_hint.cpp b/test_conformance/api/test_queue_hint.cpp index d5280d03..558ca1aa 100644 --- a/test_conformance/api/test_queue_hint.cpp +++ b/test_conformance/api/test_queue_hint.cpp @@ -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" #include #include diff --git a/test_conformance/api/test_retain_program.c b/test_conformance/api/test_retain_program.c index 4930c862..a85bc704 100644 --- a/test_conformance/api/test_retain_program.c +++ b/test_conformance/api/test_retain_program.c @@ -19,7 +19,7 @@ #include #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) { diff --git a/test_conformance/api/test_sub_group_dispatch.cpp b/test_conformance/api/test_sub_group_dispatch.cpp index b17727c5..e27afbe0 100644 --- a/test_conformance/api/test_sub_group_dispatch.cpp +++ b/test_conformance/api/test_sub_group_dispatch.cpp @@ -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" const char *subgroup_dispatch_kernel[] = { "__kernel void subgroup_dispatch_kernel(__global int *output)\n" diff --git a/test_conformance/api/test_zero_sized_enqueue.cpp b/test_conformance/api/test_zero_sized_enqueue.cpp index dbe2af2e..06791406 100644 --- a/test_conformance/api/test_zero_sized_enqueue.cpp +++ b/test_conformance/api/test_zero_sized_enqueue.cpp @@ -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" const char *zero_sized_enqueue_test_kernel[] = { "__kernel void foo_kernel(__global float *src, __global int *dst)\n" diff --git a/test_conformance/atomics/main.c b/test_conformance/atomics/main.c index 3ad70f7e..6904d7c3 100644 --- a/test_conformance/atomics/main.c +++ b/test_conformance/atomics/main.c @@ -13,12 +13,12 @@ // 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 #include #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/atomics/procs.h b/test_conformance/atomics/procs.h index 017e6c55..bf053f25 100644 --- a/test_conformance/atomics/procs.h +++ b/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); diff --git a/test_conformance/atomics/testBase.h b/test_conformance/atomics/testBase.h index 8d58eeb6..ba67d140 100644 --- a/test_conformance/atomics/testBase.h +++ b/test_conformance/atomics/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include #include diff --git a/test_conformance/atomics/test_atomics.cpp b/test_conformance/atomics/test_atomics.cpp index 5e03b70e..eb4ada79 100644 --- a/test_conformance/atomics/test_atomics.cpp +++ b/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 #endif diff --git a/test_conformance/atomics/test_indexed_cases.c b/test_conformance/atomics/test_indexed_cases.c index a620d6ef..bb4be5b7 100644 --- a/test_conformance/atomics/test_indexed_cases.c +++ b/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; diff --git a/test_conformance/basic/main.c b/test_conformance/basic/main.c index 07c37a4c..68f0b225 100644 --- a/test_conformance/basic/main.c +++ b/test_conformance/basic/main.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" #if !defined(_WIN32) #include @@ -22,10 +22,10 @@ #include #include #include -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #include "procs.h" -// FIXME: To use certain functions in ../../test_common/harness/imageHelpers.h +// FIXME: To use certain functions in harness/imageHelpers.h // (for example, generate_random_image_data()), the tests are required to declare // the following variables (): cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT; diff --git a/test_conformance/basic/procs.h b/test_conformance/basic/procs.h index 436f65f3..a76c6728 100644 --- a/test_conformance/basic/procs.h +++ b/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 ); diff --git a/test_conformance/basic/test_arraycopy.c b/test_conformance/basic/test_arraycopy.c index 5104c49b..e0cb565f 100644 --- a/test_conformance/basic/test_arraycopy.c +++ b/test_conformance/basic/test_arraycopy.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 #include diff --git a/test_conformance/basic/test_arrayimagecopy.c b/test_conformance/basic/test_arrayimagecopy.c index 2345be6b..8ff559c2 100644 --- a/test_conformance/basic/test_arrayimagecopy.c +++ b/test_conformance/basic/test_arrayimagecopy.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 #include diff --git a/test_conformance/basic/test_arrayimagecopy3d.c b/test_conformance/basic/test_arrayimagecopy3d.c index d5333777..2e7db087 100644 --- a/test_conformance/basic/test_arrayimagecopy3d.c +++ b/test_conformance/basic/test_arrayimagecopy3d.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 #include diff --git a/test_conformance/basic/test_arrayreadwrite.c b/test_conformance/basic/test_arrayreadwrite.c index 96942ec1..68664398 100644 --- a/test_conformance/basic/test_arrayreadwrite.c +++ b/test_conformance/basic/test_arrayreadwrite.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 #include diff --git a/test_conformance/basic/test_astype.cpp b/test_conformance/basic/test_astype.cpp index 9043ece2..7281f904 100644 --- a/test_conformance/basic/test_astype.cpp +++ b/test_conformance/basic/test_astype.cpp @@ -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 #include @@ -23,8 +23,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 = diff --git a/test_conformance/basic/test_async_copy.cpp b/test_conformance/basic/test_async_copy.cpp index 4d2bd9ca..a537c8fe 100644 --- a/test_conformance/basic/test_async_copy.cpp +++ b/test_conformance/basic/test_async_copy.cpp @@ -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 #include @@ -24,7 +24,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 diff --git a/test_conformance/basic/test_async_strided_copy.cpp b/test_conformance/basic/test_async_strided_copy.cpp index ca657787..fe76c844 100644 --- a/test_conformance/basic/test_async_strided_copy.cpp +++ b/test_conformance/basic/test_async_strided_copy.cpp @@ -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 #include @@ -24,7 +24,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 diff --git a/test_conformance/basic/test_barrier.c b/test_conformance/basic/test_barrier.c index b24d771b..822b8eb6 100644 --- a/test_conformance/basic/test_barrier.c +++ b/test_conformance/basic/test_barrier.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 #include diff --git a/test_conformance/basic/test_basic_parameter_types.c b/test_conformance/basic/test_basic_parameter_types.c index b10bdef3..886da6a1 100644 --- a/test_conformance/basic/test_basic_parameter_types.c +++ b/test_conformance/basic/test_basic_parameter_types.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 #include diff --git a/test_conformance/basic/test_bufferreadwriterect.c b/test_conformance/basic/test_bufferreadwriterect.c index 1631056b..bd813807 100644 --- a/test_conformance/basic/test_bufferreadwriterect.c +++ b/test_conformance/basic/test_bufferreadwriterect.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 #include diff --git a/test_conformance/basic/test_constant.c b/test_conformance/basic/test_constant.c index a36039a9..2bd661a9 100644 --- a/test_conformance/basic/test_constant.c +++ b/test_conformance/basic/test_constant.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 #include diff --git a/test_conformance/basic/test_constant_source.cpp b/test_conformance/basic/test_constant_source.cpp index b6a3cf4c..d6099e7c 100644 --- a/test_conformance/basic/test_constant_source.cpp +++ b/test_conformance/basic/test_constant_source.cpp @@ -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 #include diff --git a/test_conformance/basic/test_createkernelsinprogram.c b/test_conformance/basic/test_createkernelsinprogram.c index 2940f298..77eba3f9 100644 --- a/test_conformance/basic/test_createkernelsinprogram.c +++ b/test_conformance/basic/test_createkernelsinprogram.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 #include diff --git a/test_conformance/basic/test_enqueue_map.cpp b/test_conformance/basic/test_enqueue_map.cpp index d78d20e5..76e2e865 100644 --- a/test_conformance/basic/test_enqueue_map.cpp +++ b/test_conformance/basic/test_enqueue_map.cpp @@ -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 #include @@ -23,8 +23,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, diff --git a/test_conformance/basic/test_enqueued_local_size.c b/test_conformance/basic/test_enqueued_local_size.c index 371f9ac6..5db09246 100644 --- a/test_conformance/basic/test_enqueued_local_size.c +++ b/test_conformance/basic/test_enqueued_local_size.c @@ -13,14 +13,14 @@ // 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 #include #include #include #include -#include "../../test_common/harness/rounding_mode.h" +#include "harness/rounding_mode.h" #include "procs.h" diff --git a/test_conformance/basic/test_explicit_s2v.cpp b/test_conformance/basic/test_explicit_s2v.cpp index 6da587cc..8469b736 100644 --- a/test_conformance/basic/test_explicit_s2v.cpp +++ b/test_conformance/basic/test_explicit_s2v.cpp @@ -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 #include @@ -23,8 +23,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" \ diff --git a/test_conformance/basic/test_float2int.c b/test_conformance/basic/test_float2int.c index 55411728..b6af322c 100644 --- a/test_conformance/basic/test_float2int.c +++ b/test_conformance/basic/test_float2int.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 #include diff --git a/test_conformance/basic/test_fpmath_float.c b/test_conformance/basic/test_fpmath_float.c index 7c395fc0..9ae38b82 100644 --- a/test_conformance/basic/test_fpmath_float.c +++ b/test_conformance/basic/test_fpmath_float.c @@ -13,14 +13,14 @@ // 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 #include #include #include #include -#include "../../test_common/harness/rounding_mode.h" +#include "harness/rounding_mode.h" #include "procs.h" diff --git a/test_conformance/basic/test_fpmath_float2.c b/test_conformance/basic/test_fpmath_float2.c index 20747bc3..9c154e59 100644 --- a/test_conformance/basic/test_fpmath_float2.c +++ b/test_conformance/basic/test_fpmath_float2.c @@ -13,14 +13,14 @@ // 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 #include #include #include #include -#include "../../test_common/harness/rounding_mode.h" +#include "harness/rounding_mode.h" #include "procs.h" diff --git a/test_conformance/basic/test_fpmath_float4.c b/test_conformance/basic/test_fpmath_float4.c index 7dee498c..26c1a849 100644 --- a/test_conformance/basic/test_fpmath_float4.c +++ b/test_conformance/basic/test_fpmath_float4.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 #include @@ -23,7 +23,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" diff --git a/test_conformance/basic/test_global_linear_id.c b/test_conformance/basic/test_global_linear_id.c index 159d5956..7bed5b88 100644 --- a/test_conformance/basic/test_global_linear_id.c +++ b/test_conformance/basic/test_global_linear_id.c @@ -13,14 +13,14 @@ // 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 #include #include #include #include -#include "../../test_common/harness/rounding_mode.h" +#include "harness/rounding_mode.h" #include "procs.h" diff --git a/test_conformance/basic/test_hiloeo.c b/test_conformance/basic/test_hiloeo.c index c9777ec8..4cdf2ac7 100644 --- a/test_conformance/basic/test_hiloeo.c +++ b/test_conformance/basic/test_hiloeo.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 #include diff --git a/test_conformance/basic/test_hostptr.c b/test_conformance/basic/test_hostptr.c index 0719552f..f40cb698 100644 --- a/test_conformance/basic/test_hostptr.c +++ b/test_conformance/basic/test_hostptr.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 #include diff --git a/test_conformance/basic/test_if.c b/test_conformance/basic/test_if.c index 0e40cf07..c92ec322 100644 --- a/test_conformance/basic/test_if.c +++ b/test_conformance/basic/test_if.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 #include diff --git a/test_conformance/basic/test_image_multipass.c b/test_conformance/basic/test_image_multipass.c index fa828767..5f75c936 100644 --- a/test_conformance/basic/test_image_multipass.c +++ b/test_conformance/basic/test_image_multipass.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 #include diff --git a/test_conformance/basic/test_image_param.c b/test_conformance/basic/test_image_param.c index e9e99fea..5d3656fc 100644 --- a/test_conformance/basic/test_image_param.c +++ b/test_conformance/basic/test_image_param.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 #include @@ -23,9 +23,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[] = { diff --git a/test_conformance/basic/test_image_r8.c b/test_conformance/basic/test_image_r8.c index 02bb8483..bf8596ca 100644 --- a/test_conformance/basic/test_image_r8.c +++ b/test_conformance/basic/test_image_r8.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 #include diff --git a/test_conformance/basic/test_imagearraycopy.c b/test_conformance/basic/test_imagearraycopy.c index a361b6a4..4240466b 100644 --- a/test_conformance/basic/test_imagearraycopy.c +++ b/test_conformance/basic/test_imagearraycopy.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 #include diff --git a/test_conformance/basic/test_imagearraycopy3d.c b/test_conformance/basic/test_imagearraycopy3d.c index 9bb595a1..e34aa7d9 100644 --- a/test_conformance/basic/test_imagearraycopy3d.c +++ b/test_conformance/basic/test_imagearraycopy3d.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 #include diff --git a/test_conformance/basic/test_imagecopy.c b/test_conformance/basic/test_imagecopy.c index 258fe033..e74827d2 100644 --- a/test_conformance/basic/test_imagecopy.c +++ b/test_conformance/basic/test_imagecopy.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 #include diff --git a/test_conformance/basic/test_imagecopy3d.c b/test_conformance/basic/test_imagecopy3d.c index 67af31f2..39ca7e67 100644 --- a/test_conformance/basic/test_imagecopy3d.c +++ b/test_conformance/basic/test_imagecopy3d.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 #include diff --git a/test_conformance/basic/test_imagedim.c b/test_conformance/basic/test_imagedim.c index aa8602db..8d14a7f6 100644 --- a/test_conformance/basic/test_imagedim.c +++ b/test_conformance/basic/test_imagedim.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 #include diff --git a/test_conformance/basic/test_imagenpot.c b/test_conformance/basic/test_imagenpot.c index 2682f626..72a97675 100644 --- a/test_conformance/basic/test_imagenpot.c +++ b/test_conformance/basic/test_imagenpot.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 #include diff --git a/test_conformance/basic/test_imagerandomcopy.c b/test_conformance/basic/test_imagerandomcopy.c index 1de572f1..494d6c25 100644 --- a/test_conformance/basic/test_imagerandomcopy.c +++ b/test_conformance/basic/test_imagerandomcopy.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 #include diff --git a/test_conformance/basic/test_imagereadwrite.c b/test_conformance/basic/test_imagereadwrite.c index d5000edb..dd1923eb 100644 --- a/test_conformance/basic/test_imagereadwrite.c +++ b/test_conformance/basic/test_imagereadwrite.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 #include diff --git a/test_conformance/basic/test_imagereadwrite3d.c b/test_conformance/basic/test_imagereadwrite3d.c index e83b32fb..66f64e09 100644 --- a/test_conformance/basic/test_imagereadwrite3d.c +++ b/test_conformance/basic/test_imagereadwrite3d.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 #include diff --git a/test_conformance/basic/test_int2float.c b/test_conformance/basic/test_int2float.c index 3211ccd2..d298dc7f 100644 --- a/test_conformance/basic/test_int2float.c +++ b/test_conformance/basic/test_int2float.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 #include diff --git a/test_conformance/basic/test_intmath_int.c b/test_conformance/basic/test_intmath_int.c index 3706fd93..76676617 100644 --- a/test_conformance/basic/test_intmath_int.c +++ b/test_conformance/basic/test_intmath_int.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 #include diff --git a/test_conformance/basic/test_intmath_int2.c b/test_conformance/basic/test_intmath_int2.c index 811a842b..b4e98e10 100644 --- a/test_conformance/basic/test_intmath_int2.c +++ b/test_conformance/basic/test_intmath_int2.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 #include diff --git a/test_conformance/basic/test_intmath_int4.c b/test_conformance/basic/test_intmath_int4.c index 473cefb1..7be9da8d 100644 --- a/test_conformance/basic/test_intmath_int4.c +++ b/test_conformance/basic/test_intmath_int4.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 #include diff --git a/test_conformance/basic/test_intmath_long.c b/test_conformance/basic/test_intmath_long.c index 20a8333e..f163d3b7 100644 --- a/test_conformance/basic/test_intmath_long.c +++ b/test_conformance/basic/test_intmath_long.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 #include diff --git a/test_conformance/basic/test_intmath_long2.c b/test_conformance/basic/test_intmath_long2.c index d883e182..3736450e 100644 --- a/test_conformance/basic/test_intmath_long2.c +++ b/test_conformance/basic/test_intmath_long2.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 #include diff --git a/test_conformance/basic/test_intmath_long4.c b/test_conformance/basic/test_intmath_long4.c index 84c5ed83..1a5faae6 100644 --- a/test_conformance/basic/test_intmath_long4.c +++ b/test_conformance/basic/test_intmath_long4.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 #include diff --git a/test_conformance/basic/test_kernel_memory_alignment.cpp b/test_conformance/basic/test_kernel_memory_alignment.cpp index adcfdaa2..869ce2ec 100644 --- a/test_conformance/basic/test_kernel_memory_alignment.cpp +++ b/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 = diff --git a/test_conformance/basic/test_local.c b/test_conformance/basic/test_local.c index 54345ebd..75eb5659 100644 --- a/test_conformance/basic/test_local.c +++ b/test_conformance/basic/test_local.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 #include diff --git a/test_conformance/basic/test_local_kernel_scope.cpp b/test_conformance/basic/test_local_kernel_scope.cpp index d958dc64..57174f03 100644 --- a/test_conformance/basic/test_local_kernel_scope.cpp +++ b/test_conformance/basic/test_local_kernel_scope.cpp @@ -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 #include diff --git a/test_conformance/basic/test_local_linear_id.c b/test_conformance/basic/test_local_linear_id.c index 52e4cb00..cdf5ee69 100644 --- a/test_conformance/basic/test_local_linear_id.c +++ b/test_conformance/basic/test_local_linear_id.c @@ -13,14 +13,14 @@ // 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 #include #include #include #include -#include "../../test_common/harness/rounding_mode.h" +#include "harness/rounding_mode.h" #include "procs.h" diff --git a/test_conformance/basic/test_loop.c b/test_conformance/basic/test_loop.c index 250cce2a..1a91d9e4 100644 --- a/test_conformance/basic/test_loop.c +++ b/test_conformance/basic/test_loop.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 #include diff --git a/test_conformance/basic/test_multireadimagemultifmt.c b/test_conformance/basic/test_multireadimagemultifmt.c index a24c2aba..fd15d284 100644 --- a/test_conformance/basic/test_multireadimagemultifmt.c +++ b/test_conformance/basic/test_multireadimagemultifmt.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 #include diff --git a/test_conformance/basic/test_multireadimageonefmt.c b/test_conformance/basic/test_multireadimageonefmt.c index fa18c8de..f39d8912 100644 --- a/test_conformance/basic/test_multireadimageonefmt.c +++ b/test_conformance/basic/test_multireadimageonefmt.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 #include diff --git a/test_conformance/basic/test_pointercast.c b/test_conformance/basic/test_pointercast.c index 0b343f95..a3993d52 100644 --- a/test_conformance/basic/test_pointercast.c +++ b/test_conformance/basic/test_pointercast.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 #include diff --git a/test_conformance/basic/test_progvar.cpp b/test_conformance/basic/test_progvar.cpp index 1879d8d6..b8555786 100644 --- a/test_conformance/basic/test_progvar.cpp +++ b/test_conformance/basic/test_progvar.cpp @@ -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" // Bug: Missing in spec: atomic_intptr_t is always supported if device is 32-bits. // Bug: Missing in spec: CL_DEVICE_GLOBAL_VARIABLE_PREFERRED_TOTAL_SIZE @@ -45,9 +45,9 @@ #include #include #include -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/typeWrappers.h" +#include "harness/errorHelpers.h" +#include "harness/mt19937.h" #include "procs.h" diff --git a/test_conformance/basic/test_queue_priority.c b/test_conformance/basic/test_queue_priority.c index f780962d..3eecb63f 100644 --- a/test_conformance/basic/test_queue_priority.c +++ b/test_conformance/basic/test_queue_priority.c @@ -13,14 +13,14 @@ // 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 #include #include #include #include -#include "../../test_common/harness/rounding_mode.h" +#include "harness/rounding_mode.h" #include "procs.h" diff --git a/test_conformance/basic/test_readimage.c b/test_conformance/basic/test_readimage.c index f6374964..30eb7dbd 100644 --- a/test_conformance/basic/test_readimage.c +++ b/test_conformance/basic/test_readimage.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 #include diff --git a/test_conformance/basic/test_readimage3d.c b/test_conformance/basic/test_readimage3d.c index 01c927b0..f962a352 100644 --- a/test_conformance/basic/test_readimage3d.c +++ b/test_conformance/basic/test_readimage3d.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 #include diff --git a/test_conformance/basic/test_readimage3d_fp32.c b/test_conformance/basic/test_readimage3d_fp32.c index e17b3c3d..fb0a786e 100644 --- a/test_conformance/basic/test_readimage3d_fp32.c +++ b/test_conformance/basic/test_readimage3d_fp32.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 #include diff --git a/test_conformance/basic/test_readimage3d_int16.c b/test_conformance/basic/test_readimage3d_int16.c index 598497b3..6b0f7713 100644 --- a/test_conformance/basic/test_readimage3d_int16.c +++ b/test_conformance/basic/test_readimage3d_int16.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 #include diff --git a/test_conformance/basic/test_readimage_fp32.c b/test_conformance/basic/test_readimage_fp32.c index b1663ab4..11e8369f 100644 --- a/test_conformance/basic/test_readimage_fp32.c +++ b/test_conformance/basic/test_readimage_fp32.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 #include diff --git a/test_conformance/basic/test_readimage_int16.c b/test_conformance/basic/test_readimage_int16.c index 4456f4ae..b0e216ca 100644 --- a/test_conformance/basic/test_readimage_int16.c +++ b/test_conformance/basic/test_readimage_int16.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 #include diff --git a/test_conformance/basic/test_rw_image_access_qualifier.c b/test_conformance/basic/test_rw_image_access_qualifier.c index 0f33cd8d..832ec866 100644 --- a/test_conformance/basic/test_rw_image_access_qualifier.c +++ b/test_conformance/basic/test_rw_image_access_qualifier.c @@ -19,7 +19,7 @@ #include #include "procs.h" -#include "../../test_common/harness/clImageHelper.h" +#include "harness/clImageHelper.h" static const char* rw_kernel_code = "kernel void test_rw_images(read_write image2d_t src_image) {\n" diff --git a/test_conformance/basic/test_simple_image_pitch.c b/test_conformance/basic/test_simple_image_pitch.c index 392fed58..1cd82b6f 100644 --- a/test_conformance/basic/test_simple_image_pitch.c +++ b/test_conformance/basic/test_simple_image_pitch.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 #include diff --git a/test_conformance/basic/test_sizeof.c b/test_conformance/basic/test_sizeof.c index bdbc40fe..d37c5688 100644 --- a/test_conformance/basic/test_sizeof.c +++ b/test_conformance/basic/test_sizeof.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 #include diff --git a/test_conformance/basic/test_vec_type_hint.c b/test_conformance/basic/test_vec_type_hint.c index a35d8403..33168b13 100644 --- a/test_conformance/basic/test_vec_type_hint.c +++ b/test_conformance/basic/test_vec_type_hint.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 #include @@ -23,8 +23,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 = { diff --git a/test_conformance/basic/test_vector_creation.cpp b/test_conformance/basic/test_vector_creation.cpp index 9ab0103a..d9530b4e 100644 --- a/test_conformance/basic/test_vector_creation.cpp +++ b/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" diff --git a/test_conformance/basic/test_vloadstore.c b/test_conformance/basic/test_vloadstore.c index 74518137..e137f9e7 100644 --- a/test_conformance/basic/test_vloadstore.c +++ b/test_conformance/basic/test_vloadstore.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 #include @@ -24,9 +24,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 diff --git a/test_conformance/basic/test_wg_barrier.c b/test_conformance/basic/test_wg_barrier.c index e23490d3..78675124 100644 --- a/test_conformance/basic/test_wg_barrier.c +++ b/test_conformance/basic/test_wg_barrier.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 #include diff --git a/test_conformance/basic/test_work_item_functions.cpp b/test_conformance/basic/test_work_item_functions.cpp index a9ae4df8..48cb443c 100644 --- a/test_conformance/basic/test_work_item_functions.cpp +++ b/test_conformance/basic/test_work_item_functions.cpp @@ -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 #include @@ -23,8 +23,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 { diff --git a/test_conformance/basic/test_writeimage.c b/test_conformance/basic/test_writeimage.c index da4bd99d..259b50d9 100644 --- a/test_conformance/basic/test_writeimage.c +++ b/test_conformance/basic/test_writeimage.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 #include diff --git a/test_conformance/basic/test_writeimage_fp32.c b/test_conformance/basic/test_writeimage_fp32.c index 0fc2f3de..fef71874 100644 --- a/test_conformance/basic/test_writeimage_fp32.c +++ b/test_conformance/basic/test_writeimage_fp32.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 #include diff --git a/test_conformance/basic/test_writeimage_int16.c b/test_conformance/basic/test_writeimage_int16.c index c084c3a4..8afb77a9 100644 --- a/test_conformance/basic/test_writeimage_int16.c +++ b/test_conformance/basic/test_writeimage_int16.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 #include diff --git a/test_conformance/buffers/array_info.c b/test_conformance/buffers/array_info.c index 1fe0c553..be33c007 100644 --- a/test_conformance/buffers/array_info.c +++ b/test_conformance/buffers/array_info.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 #include diff --git a/test_conformance/buffers/main.c b/test_conformance/buffers/main.c index 013cf659..1a5c8644 100644 --- a/test_conformance/buffers/main.c +++ b/test_conformance/buffers/main.c @@ -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 #include #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" test_definition test_list[] = { ADD_TEST( buffer_read_async_int ), diff --git a/test_conformance/buffers/procs.h b/test_conformance/buffers/procs.h index 256a4ccc..fb0f851a 100644 --- a/test_conformance/buffers/procs.h +++ b/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 diff --git a/test_conformance/buffers/test_buffer_copy.c b/test_conformance/buffers/test_buffer_copy.c index fa2d579d..62862d2e 100644 --- a/test_conformance/buffers/test_buffer_copy.c +++ b/test_conformance/buffers/test_buffer_copy.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 #include @@ -22,7 +22,7 @@ #include #include "procs.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" static int verify_copy_buffer(int *inptr, int *outptr, int n) diff --git a/test_conformance/buffers/test_buffer_fill.c b/test_conformance/buffers/test_buffer_fill.c index f5662da7..142b7da0 100644 --- a/test_conformance/buffers/test_buffer_fill.c +++ b/test_conformance/buffers/test_buffer_fill.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 #include @@ -22,7 +22,7 @@ #include #include "procs.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" #define USE_LOCAL_WORK_GROUP 1 diff --git a/test_conformance/buffers/test_buffer_map.c b/test_conformance/buffers/test_buffer_map.c index 0f7089da..eebd30c6 100644 --- a/test_conformance/buffers/test_buffer_map.c +++ b/test_conformance/buffers/test_buffer_map.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 #include @@ -22,7 +22,7 @@ #include #include "procs.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" #define TEST_PRIME_INT ((1<<16)+1) diff --git a/test_conformance/buffers/test_buffer_mem.c b/test_conformance/buffers/test_buffer_mem.c index 380ca41e..a471c0f7 100644 --- a/test_conformance/buffers/test_buffer_mem.c +++ b/test_conformance/buffers/test_buffer_mem.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 #include diff --git a/test_conformance/buffers/test_buffer_migrate.c b/test_conformance/buffers/test_buffer_migrate.c index 1c4ba043..b3766c8e 100644 --- a/test_conformance/buffers/test_buffer_migrate.c +++ b/test_conformance/buffers/test_buffer_migrate.c @@ -17,8 +17,8 @@ #include #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 diff --git a/test_conformance/buffers/test_buffer_read.c b/test_conformance/buffers/test_buffer_read.c index 2755afec..de5bdf90 100644 --- a/test_conformance/buffers/test_buffer_read.c +++ b/test_conformance/buffers/test_buffer_read.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 #include diff --git a/test_conformance/buffers/test_buffer_write.c b/test_conformance/buffers/test_buffer_write.c index c7b4dc60..0f672807 100644 --- a/test_conformance/buffers/test_buffer_write.c +++ b/test_conformance/buffers/test_buffer_write.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 #include @@ -22,7 +22,7 @@ #include #include "procs.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" #define USE_LOCAL_WORK_GROUP 1 diff --git a/test_conformance/buffers/test_image_migrate.c b/test_conformance/buffers/test_image_migrate.c index c3c29757..0e3706cf 100644 --- a/test_conformance/buffers/test_image_migrate.c +++ b/test_conformance/buffers/test_image_migrate.c @@ -17,7 +17,7 @@ #include #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 diff --git a/test_conformance/c11_atomics/common.cpp b/test_conformance/c11_atomics/common.cpp index 1fb6b9b2..bebad895 100644 --- a/test_conformance/c11_atomics/common.cpp +++ b/test_conformance/c11_atomics/common.cpp @@ -13,9 +13,9 @@ // 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/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/kernelHelpers.h" +#include "harness/typeWrappers.h" #include "common.h" diff --git a/test_conformance/c11_atomics/common.h b/test_conformance/c11_atomics/common.h index afb5106f..0a22ee3e 100644 --- a/test_conformance/c11_atomics/common.h +++ b/test_conformance/c11_atomics/common.h @@ -16,9 +16,9 @@ #ifndef _COMMON_H_ #define _COMMON_H_ -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/ThreadPool.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" +#include "harness/ThreadPool.h" #include "host_atomics.h" diff --git a/test_conformance/c11_atomics/host_atomics.h b/test_conformance/c11_atomics/host_atomics.h index 9a044ded..6c4e783a 100644 --- a/test_conformance/c11_atomics/host_atomics.h +++ b/test_conformance/c11_atomics/host_atomics.h @@ -16,7 +16,7 @@ #ifndef _HOST_ATOMICS_H_ #define _HOST_ATOMICS_H_ -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #ifdef WIN32 #include "Windows.h" diff --git a/test_conformance/c11_atomics/main.cpp b/test_conformance/c11_atomics/main.cpp index 27904f94..e15fe3fc 100644 --- a/test_conformance/c11_atomics/main.cpp +++ b/test_conformance/c11_atomics/main.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #include #include diff --git a/test_conformance/c11_atomics/test_atomics.cpp b/test_conformance/c11_atomics/test_atomics.cpp index 945157fb..e005e9c7 100644 --- a/test_conformance/c11_atomics/test_atomics.cpp +++ b/test_conformance/c11_atomics/test_atomics.cpp @@ -13,9 +13,9 @@ // 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/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/kernelHelpers.h" +#include "harness/typeWrappers.h" #include "common.h" #include "host_atomics.h" diff --git a/test_conformance/clcpp/common.hpp b/test_conformance/clcpp/common.hpp index ff92f029..e0620026 100644 --- a/test_conformance/clcpp/common.hpp +++ b/test_conformance/clcpp/common.hpp @@ -24,13 +24,13 @@ #include // harness framework -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" +#include "harness/compat.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" // autotest -#include "../../test_common/autotest/autotest.hpp" +#include "autotest/autotest.hpp" // utils_common #include "utils_common/is_vector_type.hpp" diff --git a/test_conformance/clcpp/images/common.hpp b/test_conformance/clcpp/images/common.hpp index f975d7ed..9ca06552 100644 --- a/test_conformance/clcpp/images/common.hpp +++ b/test_conformance/clcpp/images/common.hpp @@ -24,7 +24,7 @@ // This global variable is used by read_image_pixel from harness/imageHelpers bool gTestRounding = false; -#include "../../../test_common/harness/imageHelpers.h" +#include "../harness/imageHelpers.h" namespace detail diff --git a/test_conformance/clcpp/utils_common/errors.hpp b/test_conformance/clcpp/utils_common/errors.hpp index e47eff3e..c1694626 100644 --- a/test_conformance/clcpp/utils_common/errors.hpp +++ b/test_conformance/clcpp/utils_common/errors.hpp @@ -18,7 +18,7 @@ #include -#include "../../../test_common/harness/errorHelpers.h" +#include "../harness/errorHelpers.h" // ------------- Check OpenCL error helpers (marcos) ----------------- diff --git a/test_conformance/commonfns/main.c b/test_conformance/commonfns/main.c index f6c38f3f..739e09ee 100644 --- a/test_conformance/commonfns/main.c +++ b/test_conformance/commonfns/main.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 #include diff --git a/test_conformance/commonfns/procs.h b/test_conformance/commonfns/procs.h index 1c6e9dab..dada94f9 100644 --- a/test_conformance/commonfns/procs.h +++ b/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 diff --git a/test_conformance/commonfns/test_binary_fn.c b/test_conformance/commonfns/test_binary_fn.c index f0a1109f..51d73659 100644 --- a/test_conformance/commonfns/test_binary_fn.c +++ b/test_conformance/commonfns/test_binary_fn.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 #include diff --git a/test_conformance/commonfns/test_clamp.c b/test_conformance/commonfns/test_clamp.c index 9fb46749..5d01900f 100644 --- a/test_conformance/commonfns/test_clamp.c +++ b/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 #include diff --git a/test_conformance/commonfns/test_degrees.c b/test_conformance/commonfns/test_degrees.c index f3871fc9..d6593db3 100644 --- a/test_conformance/commonfns/test_degrees.c +++ b/test_conformance/commonfns/test_degrees.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 #include diff --git a/test_conformance/commonfns/test_fmax.c b/test_conformance/commonfns/test_fmax.c index 0605eff9..462f9e49 100644 --- a/test_conformance/commonfns/test_fmax.c +++ b/test_conformance/commonfns/test_fmax.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 #include diff --git a/test_conformance/commonfns/test_fmaxf.c b/test_conformance/commonfns/test_fmaxf.c index bba7f2ce..2ed1bcc2 100644 --- a/test_conformance/commonfns/test_fmaxf.c +++ b/test_conformance/commonfns/test_fmaxf.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 #include diff --git a/test_conformance/commonfns/test_fmin.c b/test_conformance/commonfns/test_fmin.c index 20baed62..7efbb8fe 100644 --- a/test_conformance/commonfns/test_fmin.c +++ b/test_conformance/commonfns/test_fmin.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 #include diff --git a/test_conformance/commonfns/test_fminf.c b/test_conformance/commonfns/test_fminf.c index 47abfd17..f04fb1ef 100644 --- a/test_conformance/commonfns/test_fminf.c +++ b/test_conformance/commonfns/test_fminf.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 #include diff --git a/test_conformance/commonfns/test_max.c b/test_conformance/commonfns/test_max.c index cdb49c59..9f3b80ec 100644 --- a/test_conformance/commonfns/test_max.c +++ b/test_conformance/commonfns/test_max.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 #include diff --git a/test_conformance/commonfns/test_maxf.c b/test_conformance/commonfns/test_maxf.c index b3992e46..f96df7ea 100644 --- a/test_conformance/commonfns/test_maxf.c +++ b/test_conformance/commonfns/test_maxf.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 #include diff --git a/test_conformance/commonfns/test_min.c b/test_conformance/commonfns/test_min.c index e93b39f0..707e24b6 100644 --- a/test_conformance/commonfns/test_min.c +++ b/test_conformance/commonfns/test_min.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 #include diff --git a/test_conformance/commonfns/test_minf.c b/test_conformance/commonfns/test_minf.c index 16f38e4f..71b1fbe0 100644 --- a/test_conformance/commonfns/test_minf.c +++ b/test_conformance/commonfns/test_minf.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 #include @@ -21,7 +21,7 @@ #include #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 ) { diff --git a/test_conformance/commonfns/test_mix.c b/test_conformance/commonfns/test_mix.c index b7beb822..d773f76c 100644 --- a/test_conformance/commonfns/test_mix.c +++ b/test_conformance/commonfns/test_mix.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 #include diff --git a/test_conformance/commonfns/test_radians.c b/test_conformance/commonfns/test_radians.c index 0f2dd9d5..9ff53a67 100644 --- a/test_conformance/commonfns/test_radians.c +++ b/test_conformance/commonfns/test_radians.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 #include diff --git a/test_conformance/commonfns/test_sign.c b/test_conformance/commonfns/test_sign.c index 6a3a2c74..bf8d8c79 100644 --- a/test_conformance/commonfns/test_sign.c +++ b/test_conformance/commonfns/test_sign.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 #include diff --git a/test_conformance/commonfns/test_smoothstep.c b/test_conformance/commonfns/test_smoothstep.c index ec3ff016..19201fd5 100644 --- a/test_conformance/commonfns/test_smoothstep.c +++ b/test_conformance/commonfns/test_smoothstep.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 #include diff --git a/test_conformance/commonfns/test_smoothstepf.c b/test_conformance/commonfns/test_smoothstepf.c index 7b93ac12..118fa895 100644 --- a/test_conformance/commonfns/test_smoothstepf.c +++ b/test_conformance/commonfns/test_smoothstepf.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 #include diff --git a/test_conformance/commonfns/test_step.c b/test_conformance/commonfns/test_step.c index b81a0d95..3b1a5ba3 100644 --- a/test_conformance/commonfns/test_step.c +++ b/test_conformance/commonfns/test_step.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 #include diff --git a/test_conformance/commonfns/test_stepf.c b/test_conformance/commonfns/test_stepf.c index 55b7ee45..ba7d2e1a 100644 --- a/test_conformance/commonfns/test_stepf.c +++ b/test_conformance/commonfns/test_stepf.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 #include diff --git a/test_conformance/compatibility/test_common/gl/helpers.h b/test_conformance/compatibility/test_common/gl/helpers.h index 86e7dde9..8f1d3462 100644 --- a/test_conformance/compatibility/test_common/gl/helpers.h +++ b/test_conformance/compatibility/test_common/gl/helpers.h @@ -31,12 +31,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, diff --git a/test_conformance/compatibility/test_common/gl/setup_osx.cpp b/test_conformance/compatibility/test_common/gl/setup_osx.cpp index 01641be0..8abddeda 100644 --- a/test_conformance/compatibility/test_common/gl/setup_osx.cpp +++ b/test_conformance/compatibility/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 class OSXGLEnvironment : public GLEnvironment diff --git a/test_conformance/compatibility/test_common/gl/setup_win32.cpp b/test_conformance/compatibility/test_common/gl/setup_win32.cpp index ff40dc25..d4870fef 100644 --- a/test_conformance/compatibility/test_common/gl/setup_win32.cpp +++ b/test_conformance/compatibility/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 #include diff --git a/test_conformance/compatibility/test_common/gl/setup_x11.cpp b/test_conformance/compatibility/test_common/gl/setup_x11.cpp index 22bc7eed..c21e99f4 100644 --- a/test_conformance/compatibility/test_common/gl/setup_x11.cpp +++ b/test_conformance/compatibility/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 #include diff --git a/test_conformance/compatibility/test_conformance/api/main.c b/test_conformance/compatibility/test_conformance/api/main.c index 1c431c6b..ed7b52a0 100644 --- a/test_conformance/compatibility/test_conformance/api/main.c +++ b/test_conformance/compatibility/test_conformance/api/main.c @@ -13,18 +13,18 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include #endif -// FIXME: To use certain functions in ../../test_common/harness/imageHelpers.h +// FIXME: To use certain functions in harness/imageHelpers.h // (for example, generate_random_image_data()), the tests are required to declare // the following variables: cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT; diff --git a/test_conformance/compatibility/test_conformance/api/procs.h b/test_conformance/compatibility/test_conformance/api/procs.h index f16467ba..bdeb0e7c 100644 --- a/test_conformance/compatibility/test_conformance/api/procs.h +++ b/test_conformance/compatibility/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); diff --git a/test_conformance/compatibility/test_conformance/api/testBase.h b/test_conformance/compatibility/test_conformance/api/testBase.h index 5073b21f..5b49bfd7 100644 --- a/test_conformance/compatibility/test_conformance/api/testBase.h +++ b/test_conformance/compatibility/test_conformance/api/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/compatibility/test_conformance/api/test_api_min_max.c b/test_conformance/compatibility/test_conformance/api/test_api_min_max.c index 8393f230..06bfcaa9 100644 --- a/test_conformance/compatibility/test_conformance/api/test_api_min_max.c +++ b/test_conformance/compatibility/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 #include diff --git a/test_conformance/compatibility/test_conformance/api/test_bool.c b/test_conformance/compatibility/test_conformance/api/test_bool.c index 30b15b3e..2702fd02 100644 --- a/test_conformance/compatibility/test_conformance/api/test_bool.c +++ b/test_conformance/compatibility/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[] = { diff --git a/test_conformance/compatibility/test_conformance/api/test_create_context_from_type.cpp b/test_conformance/compatibility/test_conformance/api/test_create_context_from_type.cpp index 2339aad8..b98a3876 100644 --- a/test_conformance/compatibility/test_conformance/api/test_create_context_from_type.cpp +++ b/test_conformance/compatibility/test_conformance/api/test_create_context_from_type.cpp @@ -19,8 +19,8 @@ #include #endif -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/conversions.h" +#include "harness/testHarness.h" +#include "harness/conversions.h" extern cl_uint gRandomSeed; diff --git a/test_conformance/compatibility/test_conformance/api/test_create_kernels.c b/test_conformance/compatibility/test_conformance/api/test_create_kernels.c index 438300b1..f846d2e2 100644 --- a/test_conformance/compatibility/test_conformance/api/test_create_kernels.c +++ b/test_conformance/compatibility/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[] = { diff --git a/test_conformance/compatibility/test_conformance/api/test_device_min_data_type_align_size_alignment.cpp b/test_conformance/compatibility/test_conformance/api/test_device_min_data_type_align_size_alignment.cpp index 4a742205..0115a2bc 100644 --- a/test_conformance/compatibility/test_conformance/api/test_device_min_data_type_align_size_alignment.cpp +++ b/test_conformance/compatibility/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 #endif diff --git a/test_conformance/compatibility/test_conformance/api/test_kernel_arg_multi_setup.cpp b/test_conformance/compatibility/test_conformance/api/test_kernel_arg_multi_setup.cpp index 89c5eeb1..dbf2eed6 100644 --- a/test_conformance/compatibility/test_conformance/api/test_kernel_arg_multi_setup.cpp +++ b/test_conformance/compatibility/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 diff --git a/test_conformance/compatibility/test_conformance/api/test_kernels.c b/test_conformance/compatibility/test_conformance/api/test_kernels.c index 9cfbca27..8f042a9e 100644 --- a/test_conformance/compatibility/test_conformance/api/test_kernels.c +++ b/test_conformance/compatibility/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; diff --git a/test_conformance/compatibility/test_conformance/api/test_mem_object_info.cpp b/test_conformance/compatibility/test_conformance/api/test_mem_object_info.cpp index b4e14569..73cf1eef 100644 --- a/test_conformance/compatibility/test_conformance/api/test_mem_object_info.cpp +++ b/test_conformance/compatibility/test_conformance/api/test_mem_object_info.cpp @@ -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" extern cl_uint gRandomSeed; diff --git a/test_conformance/compatibility/test_conformance/api/test_native_kernel.cpp b/test_conformance/compatibility/test_conformance/api/test_native_kernel.cpp index 2d52134b..49a13f94 100644 --- a/test_conformance/compatibility/test_conformance/api/test_native_kernel.cpp +++ b/test_conformance/compatibility/test_conformance/api/test_native_kernel.cpp @@ -19,7 +19,7 @@ #include #endif -#include "../../test_common/harness/conversions.h" +#include "harness/conversions.h" extern cl_uint gRandomSeed; diff --git a/test_conformance/compatibility/test_conformance/api/test_queries.cpp b/test_conformance/compatibility/test_conformance/api/test_queries.cpp index 8e34f97d..1757324b 100644 --- a/test_conformance/compatibility/test_conformance/api/test_queries.cpp +++ b/test_conformance/compatibility/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 #include diff --git a/test_conformance/compatibility/test_conformance/api/test_queue_properties.cpp b/test_conformance/compatibility/test_conformance/api/test_queue_properties.cpp index 3b368077..6560d786 100644 --- a/test_conformance/compatibility/test_conformance/api/test_queue_properties.cpp +++ b/test_conformance/compatibility/test_conformance/api/test_queue_properties.cpp @@ -16,8 +16,8 @@ #include "testBase.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/conversions.h" +#include "harness/typeWrappers.h" +#include "harness/conversions.h" #include #include #include diff --git a/test_conformance/compatibility/test_conformance/api/test_retain_program.c b/test_conformance/compatibility/test_conformance/api/test_retain_program.c index 7fe22f0c..2683decb 100644 --- a/test_conformance/compatibility/test_conformance/api/test_retain_program.c +++ b/test_conformance/compatibility/test_conformance/api/test_retain_program.c @@ -19,7 +19,7 @@ #include #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) { diff --git a/test_conformance/compatibility/test_conformance/basic/main.c b/test_conformance/compatibility/test_conformance/basic/main.c index f8fff798..8b27d8a3 100644 --- a/test_conformance/compatibility/test_conformance/basic/main.c +++ b/test_conformance/compatibility/test_conformance/basic/main.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" #if !defined(_WIN32) #include @@ -21,10 +21,10 @@ #include #include -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #include "procs.h" -// FIXME: To use certain functions in ../../test_common/harness/imageHelpers.h +// FIXME: To use certain functions in harness/imageHelpers.h // (for example, generate_random_image_data()), the tests are required to declare // the following variables: cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT; diff --git a/test_conformance/compatibility/test_conformance/basic/procs.h b/test_conformance/compatibility/test_conformance/basic/procs.h index 750c3656..087e95e7 100644 --- a/test_conformance/compatibility/test_conformance/basic/procs.h +++ b/test_conformance/compatibility/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 ); diff --git a/test_conformance/compatibility/test_conformance/basic/test_arraycopy.c b/test_conformance/compatibility/test_conformance/basic/test_arraycopy.c index 5104c49b..e0cb565f 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_arraycopy.c +++ b/test_conformance/compatibility/test_conformance/basic/test_arraycopy.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_arrayimagecopy.c b/test_conformance/compatibility/test_conformance/basic/test_arrayimagecopy.c index 41627198..f7af8d6b 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_arrayimagecopy.c +++ b/test_conformance/compatibility/test_conformance/basic/test_arrayimagecopy.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_arrayimagecopy3d.c b/test_conformance/compatibility/test_conformance/basic/test_arrayimagecopy3d.c index 5b7ed5a7..c1430814 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_arrayimagecopy3d.c +++ b/test_conformance/compatibility/test_conformance/basic/test_arrayimagecopy3d.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_arrayreadwrite.c b/test_conformance/compatibility/test_conformance/basic/test_arrayreadwrite.c index 3a58c6aa..a3c5fc06 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_arrayreadwrite.c +++ b/test_conformance/compatibility/test_conformance/basic/test_arrayreadwrite.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_astype.cpp b/test_conformance/compatibility/test_conformance/basic/test_astype.cpp index ea8a94f4..7093a30f 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_astype.cpp +++ b/test_conformance/compatibility/test_conformance/basic/test_astype.cpp @@ -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 #include @@ -24,8 +24,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 = diff --git a/test_conformance/compatibility/test_conformance/basic/test_async_copy.cpp b/test_conformance/compatibility/test_conformance/basic/test_async_copy.cpp index 234ed698..c3ac7bb6 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_async_copy.cpp +++ b/test_conformance/compatibility/test_conformance/basic/test_async_copy.cpp @@ -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 #include @@ -23,7 +23,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 diff --git a/test_conformance/compatibility/test_conformance/basic/test_async_strided_copy.cpp b/test_conformance/compatibility/test_conformance/basic/test_async_strided_copy.cpp index dca52b5e..667c7539 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_async_strided_copy.cpp +++ b/test_conformance/compatibility/test_conformance/basic/test_async_strided_copy.cpp @@ -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 #include @@ -23,7 +23,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 diff --git a/test_conformance/compatibility/test_conformance/basic/test_barrier.c b/test_conformance/compatibility/test_conformance/basic/test_barrier.c index 87d106d3..e4887099 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_barrier.c +++ b/test_conformance/compatibility/test_conformance/basic/test_barrier.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_basic_parameter_types.c b/test_conformance/compatibility/test_conformance/basic/test_basic_parameter_types.c index a15d8e76..dc14f18f 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_basic_parameter_types.c +++ b/test_conformance/compatibility/test_conformance/basic/test_basic_parameter_types.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_bufferreadwriterect.c b/test_conformance/compatibility/test_conformance/basic/test_bufferreadwriterect.c index e72ae708..025f65ec 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_bufferreadwriterect.c +++ b/test_conformance/compatibility/test_conformance/basic/test_bufferreadwriterect.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_constant.c b/test_conformance/compatibility/test_conformance/basic/test_constant.c index 2427b3aa..4e82c01f 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_constant.c +++ b/test_conformance/compatibility/test_conformance/basic/test_constant.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_constant_source.cpp b/test_conformance/compatibility/test_conformance/basic/test_constant_source.cpp index 75927773..8a161c96 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_constant_source.cpp +++ b/test_conformance/compatibility/test_conformance/basic/test_constant_source.cpp @@ -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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_createkernelsinprogram.c b/test_conformance/compatibility/test_conformance/basic/test_createkernelsinprogram.c index 58bcc810..86eaf092 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_createkernelsinprogram.c +++ b/test_conformance/compatibility/test_conformance/basic/test_createkernelsinprogram.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_enqueue_map.cpp b/test_conformance/compatibility/test_conformance/basic/test_enqueue_map.cpp index 3bf7be58..ab0c2eef 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_enqueue_map.cpp +++ b/test_conformance/compatibility/test_conformance/basic/test_enqueue_map.cpp @@ -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 #include @@ -22,8 +22,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, diff --git a/test_conformance/compatibility/test_conformance/basic/test_explicit_s2v.cpp b/test_conformance/compatibility/test_conformance/basic/test_explicit_s2v.cpp index 205e7bbd..4079d714 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_explicit_s2v.cpp +++ b/test_conformance/compatibility/test_conformance/basic/test_explicit_s2v.cpp @@ -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 #include @@ -22,8 +22,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" \ diff --git a/test_conformance/compatibility/test_conformance/basic/test_float2int.c b/test_conformance/compatibility/test_conformance/basic/test_float2int.c index 0191ceec..2a78f3a0 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_float2int.c +++ b/test_conformance/compatibility/test_conformance/basic/test_float2int.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_fpmath_float.c b/test_conformance/compatibility/test_conformance/basic/test_fpmath_float.c index b5b3dae9..54a795fc 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_fpmath_float.c +++ b/test_conformance/compatibility/test_conformance/basic/test_fpmath_float.c @@ -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 #include #include #include -#include "../../test_common/harness/rounding_mode.h" +#include "harness/rounding_mode.h" #include "procs.h" diff --git a/test_conformance/compatibility/test_conformance/basic/test_fpmath_float2.c b/test_conformance/compatibility/test_conformance/basic/test_fpmath_float2.c index 1e938b9b..d9fbbfa2 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_fpmath_float2.c +++ b/test_conformance/compatibility/test_conformance/basic/test_fpmath_float2.c @@ -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 #include #include #include -#include "../../test_common/harness/rounding_mode.h" +#include "harness/rounding_mode.h" #include "procs.h" diff --git a/test_conformance/compatibility/test_conformance/basic/test_fpmath_float4.c b/test_conformance/compatibility/test_conformance/basic/test_fpmath_float4.c index 284d5f1b..511e9c5b 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_fpmath_float4.c +++ b/test_conformance/compatibility/test_conformance/basic/test_fpmath_float4.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 #include @@ -22,7 +22,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" diff --git a/test_conformance/compatibility/test_conformance/basic/test_hiloeo.c b/test_conformance/compatibility/test_conformance/basic/test_hiloeo.c index 72e97cee..493e85b3 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_hiloeo.c +++ b/test_conformance/compatibility/test_conformance/basic/test_hiloeo.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_hostptr.c b/test_conformance/compatibility/test_conformance/basic/test_hostptr.c index 25fc0f74..92c2318e 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_hostptr.c +++ b/test_conformance/compatibility/test_conformance/basic/test_hostptr.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_if.c b/test_conformance/compatibility/test_conformance/basic/test_if.c index f6c5db4c..14e2a6d7 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_if.c +++ b/test_conformance/compatibility/test_conformance/basic/test_if.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_image_multipass.c b/test_conformance/compatibility/test_conformance/basic/test_image_multipass.c index 74a539c8..fbc2e506 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_image_multipass.c +++ b/test_conformance/compatibility/test_conformance/basic/test_image_multipass.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_image_param.c b/test_conformance/compatibility/test_conformance/basic/test_image_param.c index 567af7f2..229975ed 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_image_param.c +++ b/test_conformance/compatibility/test_conformance/basic/test_image_param.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 #include @@ -22,9 +22,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[] = { diff --git a/test_conformance/compatibility/test_conformance/basic/test_image_r8.c b/test_conformance/compatibility/test_conformance/basic/test_image_r8.c index 2f9976f0..37f2bdba 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_image_r8.c +++ b/test_conformance/compatibility/test_conformance/basic/test_image_r8.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_imagearraycopy.c b/test_conformance/compatibility/test_conformance/basic/test_imagearraycopy.c index a361b6a4..4240466b 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_imagearraycopy.c +++ b/test_conformance/compatibility/test_conformance/basic/test_imagearraycopy.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_imagearraycopy3d.c b/test_conformance/compatibility/test_conformance/basic/test_imagearraycopy3d.c index d0fc05a3..a413644c 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_imagearraycopy3d.c +++ b/test_conformance/compatibility/test_conformance/basic/test_imagearraycopy3d.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_imagecopy.c b/test_conformance/compatibility/test_conformance/basic/test_imagecopy.c index d01ff5ff..684d8788 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_imagecopy.c +++ b/test_conformance/compatibility/test_conformance/basic/test_imagecopy.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_imagecopy3d.c b/test_conformance/compatibility/test_conformance/basic/test_imagecopy3d.c index 6e4cb9e7..67ccafce 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_imagecopy3d.c +++ b/test_conformance/compatibility/test_conformance/basic/test_imagecopy3d.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_imagedim.c b/test_conformance/compatibility/test_conformance/basic/test_imagedim.c index 81de4cbc..6d8cdb36 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_imagedim.c +++ b/test_conformance/compatibility/test_conformance/basic/test_imagedim.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_imagenpot.c b/test_conformance/compatibility/test_conformance/basic/test_imagenpot.c index acea61dc..39126afd 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_imagenpot.c +++ b/test_conformance/compatibility/test_conformance/basic/test_imagenpot.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_imagerandomcopy.c b/test_conformance/compatibility/test_conformance/basic/test_imagerandomcopy.c index 1b95f6a8..dfd3fa55 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_imagerandomcopy.c +++ b/test_conformance/compatibility/test_conformance/basic/test_imagerandomcopy.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_imagereadwrite.c b/test_conformance/compatibility/test_conformance/basic/test_imagereadwrite.c index 9a84e6d6..19877853 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_imagereadwrite.c +++ b/test_conformance/compatibility/test_conformance/basic/test_imagereadwrite.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_imagereadwrite3d.c b/test_conformance/compatibility/test_conformance/basic/test_imagereadwrite3d.c index 76c8f9a1..82e6b2f0 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_imagereadwrite3d.c +++ b/test_conformance/compatibility/test_conformance/basic/test_imagereadwrite3d.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_int2float.c b/test_conformance/compatibility/test_conformance/basic/test_int2float.c index 4f807d1c..cd101af1 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_int2float.c +++ b/test_conformance/compatibility/test_conformance/basic/test_int2float.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_intmath_int.c b/test_conformance/compatibility/test_conformance/basic/test_intmath_int.c index e9dbe354..73691900 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_intmath_int.c +++ b/test_conformance/compatibility/test_conformance/basic/test_intmath_int.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_intmath_int2.c b/test_conformance/compatibility/test_conformance/basic/test_intmath_int2.c index 3767f537..3a661cc9 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_intmath_int2.c +++ b/test_conformance/compatibility/test_conformance/basic/test_intmath_int2.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_intmath_int4.c b/test_conformance/compatibility/test_conformance/basic/test_intmath_int4.c index 70de6378..60985818 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_intmath_int4.c +++ b/test_conformance/compatibility/test_conformance/basic/test_intmath_int4.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_intmath_long.c b/test_conformance/compatibility/test_conformance/basic/test_intmath_long.c index c7a0e65c..e4777689 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_intmath_long.c +++ b/test_conformance/compatibility/test_conformance/basic/test_intmath_long.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_intmath_long2.c b/test_conformance/compatibility/test_conformance/basic/test_intmath_long2.c index 95d82de5..0a3a8d18 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_intmath_long2.c +++ b/test_conformance/compatibility/test_conformance/basic/test_intmath_long2.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_intmath_long4.c b/test_conformance/compatibility/test_conformance/basic/test_intmath_long4.c index 73582e3e..f0c89d12 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_intmath_long4.c +++ b/test_conformance/compatibility/test_conformance/basic/test_intmath_long4.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_kernel_memory_alignment.cpp b/test_conformance/compatibility/test_conformance/basic/test_kernel_memory_alignment.cpp index 1352e46a..a05e960a 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_kernel_memory_alignment.cpp +++ b/test_conformance/compatibility/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 = diff --git a/test_conformance/compatibility/test_conformance/basic/test_local.c b/test_conformance/compatibility/test_conformance/basic/test_local.c index 1be5926a..21184c6f 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_local.c +++ b/test_conformance/compatibility/test_conformance/basic/test_local.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_local_kernel_scope.cpp b/test_conformance/compatibility/test_conformance/basic/test_local_kernel_scope.cpp index a469751d..51c5835f 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_local_kernel_scope.cpp +++ b/test_conformance/compatibility/test_conformance/basic/test_local_kernel_scope.cpp @@ -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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_loop.c b/test_conformance/compatibility/test_conformance/basic/test_loop.c index a4f043b4..b20aa38c 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_loop.c +++ b/test_conformance/compatibility/test_conformance/basic/test_loop.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_multireadimagemultifmt.c b/test_conformance/compatibility/test_conformance/basic/test_multireadimagemultifmt.c index ac9794b9..895aeb55 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_multireadimagemultifmt.c +++ b/test_conformance/compatibility/test_conformance/basic/test_multireadimagemultifmt.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_multireadimageonefmt.c b/test_conformance/compatibility/test_conformance/basic/test_multireadimageonefmt.c index 8a70329a..91c2b5a8 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_multireadimageonefmt.c +++ b/test_conformance/compatibility/test_conformance/basic/test_multireadimageonefmt.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_pointercast.c b/test_conformance/compatibility/test_conformance/basic/test_pointercast.c index 88a19aad..f7f6538a 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_pointercast.c +++ b/test_conformance/compatibility/test_conformance/basic/test_pointercast.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_readimage.c b/test_conformance/compatibility/test_conformance/basic/test_readimage.c index e9de33c7..0888d0e1 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_readimage.c +++ b/test_conformance/compatibility/test_conformance/basic/test_readimage.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_readimage3d.c b/test_conformance/compatibility/test_conformance/basic/test_readimage3d.c index 1044f315..ad6f29e2 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_readimage3d.c +++ b/test_conformance/compatibility/test_conformance/basic/test_readimage3d.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_readimage3d_fp32.c b/test_conformance/compatibility/test_conformance/basic/test_readimage3d_fp32.c index af3fda07..55e5cf4c 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_readimage3d_fp32.c +++ b/test_conformance/compatibility/test_conformance/basic/test_readimage3d_fp32.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_readimage3d_int16.c b/test_conformance/compatibility/test_conformance/basic/test_readimage3d_int16.c index ac96a5e8..fdcd71ab 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_readimage3d_int16.c +++ b/test_conformance/compatibility/test_conformance/basic/test_readimage3d_int16.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_readimage_fp32.c b/test_conformance/compatibility/test_conformance/basic/test_readimage_fp32.c index 845e42ba..82d632ef 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_readimage_fp32.c +++ b/test_conformance/compatibility/test_conformance/basic/test_readimage_fp32.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_readimage_int16.c b/test_conformance/compatibility/test_conformance/basic/test_readimage_int16.c index 6d1f030d..583ab96d 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_readimage_int16.c +++ b/test_conformance/compatibility/test_conformance/basic/test_readimage_int16.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_sizeof.c b/test_conformance/compatibility/test_conformance/basic/test_sizeof.c index 9c56bb58..63901b81 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_sizeof.c +++ b/test_conformance/compatibility/test_conformance/basic/test_sizeof.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_vec_type_hint.c b/test_conformance/compatibility/test_conformance/basic/test_vec_type_hint.c index d3b5fa76..bc682f38 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_vec_type_hint.c +++ b/test_conformance/compatibility/test_conformance/basic/test_vec_type_hint.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 #include @@ -22,8 +22,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 = { diff --git a/test_conformance/compatibility/test_conformance/basic/test_vector_creation.cpp b/test_conformance/compatibility/test_conformance/basic/test_vector_creation.cpp index 9ab0103a..d9530b4e 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_vector_creation.cpp +++ b/test_conformance/compatibility/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" diff --git a/test_conformance/compatibility/test_conformance/basic/test_vloadstore.c b/test_conformance/compatibility/test_conformance/basic/test_vloadstore.c index 7a7911b9..4c9c0196 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_vloadstore.c +++ b/test_conformance/compatibility/test_conformance/basic/test_vloadstore.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 #include @@ -23,9 +23,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 diff --git a/test_conformance/compatibility/test_conformance/basic/test_work_item_functions.cpp b/test_conformance/compatibility/test_conformance/basic/test_work_item_functions.cpp index 04de4e39..55843b5a 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_work_item_functions.cpp +++ b/test_conformance/compatibility/test_conformance/basic/test_work_item_functions.cpp @@ -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 #include @@ -22,8 +22,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 { diff --git a/test_conformance/compatibility/test_conformance/basic/test_writeimage.c b/test_conformance/compatibility/test_conformance/basic/test_writeimage.c index 26489a26..fdb901f9 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_writeimage.c +++ b/test_conformance/compatibility/test_conformance/basic/test_writeimage.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_writeimage_fp32.c b/test_conformance/compatibility/test_conformance/basic/test_writeimage_fp32.c index 70e636cd..22bac050 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_writeimage_fp32.c +++ b/test_conformance/compatibility/test_conformance/basic/test_writeimage_fp32.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 #include diff --git a/test_conformance/compatibility/test_conformance/basic/test_writeimage_int16.c b/test_conformance/compatibility/test_conformance/basic/test_writeimage_int16.c index 1f460849..3dccb69b 100644 --- a/test_conformance/compatibility/test_conformance/basic/test_writeimage_int16.c +++ b/test_conformance/compatibility/test_conformance/basic/test_writeimage_int16.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 #include diff --git a/test_conformance/compatibility/test_conformance/images/image_helpers.h b/test_conformance/compatibility/test_conformance/images/image_helpers.h index cd0eff6c..65ceb713 100644 --- a/test_conformance/compatibility/test_conformance/images/image_helpers.h +++ b/test_conformance/compatibility/test_conformance/images/image_helpers.h @@ -16,7 +16,7 @@ #ifndef _image_helpers_h #define _image_helpers_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include @@ -24,14 +24,14 @@ #include #include -#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; diff --git a/test_conformance/compiler/main.c b/test_conformance/compiler/main.c index b1973939..4d34f769 100644 --- a/test_conformance/compiler/main.c +++ b/test_conformance/compiler/main.c @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/compiler/procs.h b/test_conformance/compiler/procs.h index a3cc5710..1ba655a8 100644 --- a/test_conformance/compiler/procs.h +++ b/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); diff --git a/test_conformance/compiler/testBase.h b/test_conformance/compiler/testBase.h index 5073b21f..5b49bfd7 100644 --- a/test_conformance/compiler/testBase.h +++ b/test_conformance/compiler/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/compiler/test_build_helpers.c b/test_conformance/compiler/test_build_helpers.c index 975a21f8..0828877f 100644 --- a/test_conformance/compiler/test_build_helpers.c +++ b/test_conformance/compiler/test_build_helpers.c @@ -14,8 +14,8 @@ // limitations under the License. // #include "testBase.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/testHarness.h" +#include "harness/parseParameters.h" const char *sample_kernel_code_single_line[] = { "__kernel void sample_test(__global float *src, __global int *dst)\n" diff --git a/test_conformance/compiler/test_build_options.cpp b/test_conformance/compiler/test_build_options.cpp index 0e2f7ae8..71f84c30 100644 --- a/test_conformance/compiler/test_build_options.cpp +++ b/test_conformance/compiler/test_build_options.cpp @@ -14,7 +14,7 @@ // limitations under the License. // #include "testBase.h" -#include "../../test_common/harness/os_helpers.h" +#include "harness/os_helpers.h" const char *preprocessor_test_kernel[] = { "__kernel void sample_test(__global int *dst)\n" diff --git a/test_conformance/compiler/test_compile.c b/test_conformance/compiler/test_compile.c index dc0d0972..536ea49c 100644 --- a/test_conformance/compiler/test_compile.c +++ b/test_conformance/compiler/test_compile.c @@ -20,7 +20,7 @@ #include #include #endif -#include "../../test_common/harness/conversions.h" +#include "harness/conversions.h" extern cl_uint gRandomSeed; diff --git a/test_conformance/compiler/test_preprocessor.c b/test_conformance/compiler/test_preprocessor.c index 4f3277c6..74ebcb09 100644 --- a/test_conformance/compiler/test_preprocessor.c +++ b/test_conformance/compiler/test_preprocessor.c @@ -14,7 +14,7 @@ // limitations under the License. // #include "testBase.h" -#include "../../test_common/harness/os_helpers.h" +#include "harness/os_helpers.h" extern cl_uint gRandomSeed; diff --git a/test_conformance/computeinfo/main.c b/test_conformance/computeinfo/main.c index 34f3fb86..8f25eaa7 100644 --- a/test_conformance/computeinfo/main.c +++ b/test_conformance/computeinfo/main.c @@ -13,14 +13,14 @@ // 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 #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" static int dump_supported_formats; diff --git a/test_conformance/contractions/contractions.c b/test_conformance/contractions/contractions.c index e8e98d4c..6426e906 100644 --- a/test_conformance/contractions/contractions.c +++ b/test_conformance/contractions/contractions.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 #include @@ -30,13 +30,13 @@ #include #include "errorHelpers.h" -#include "../../test_common/harness/compat.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 "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/compat.h" +#include "harness/mt19937.h" +#include "harness/kernelHelpers.h" +#include "harness/rounding_mode.h" +#include "harness/fpcontrol.h" +#include "harness/testHarness.h" +#include "harness/parseParameters.h" #if defined( __APPLE__ ) #include #endif diff --git a/test_conformance/conversions/basic_test_conversions.c b/test_conformance/conversions/basic_test_conversions.c index bfd31b27..d32694a1 100644 --- a/test_conformance/conversions/basic_test_conversions.c +++ b/test_conformance/conversions/basic_test_conversions.c @@ -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 "basic_test_conversions.h" #include #include -#include "../../test_common/harness/mt19937.h" +#include "harness/mt19937.h" #if defined( __arm__ ) && defined( __GNUC__ ) #include "fplib.h" diff --git a/test_conformance/conversions/basic_test_conversions.h b/test_conformance/conversions/basic_test_conversions.h index ab8c68cd..3e672da9 100644 --- a/test_conformance/conversions/basic_test_conversions.h +++ b/test_conformance/conversions/basic_test_conversions.h @@ -16,14 +16,14 @@ #ifndef BASIC_TEST_CONVERSIONS_H #define BASIC_TEST_CONVERSIONS_H -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #if !defined(_WIN32) #include #endif -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/rounding_mode.h" +#include "harness/errorHelpers.h" +#include "harness/rounding_mode.h" #include #if defined( __APPLE__ ) @@ -32,7 +32,7 @@ #include #endif -#include "../../test_common/harness/mt19937.h" +#include "harness/mt19937.h" typedef void (*Convert)( void *dest, void *src, size_t ); diff --git a/test_conformance/conversions/test_conversions.c b/test_conformance/conversions/test_conversions.c index 3212d3d0..f28594b8 100644 --- a/test_conformance/conversions/test_conversions.c +++ b/test_conformance/conversions/test_conversions.c @@ -13,12 +13,12 @@ // 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/testHarness.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/compat.h" +#include "harness/rounding_mode.h" +#include "harness/ThreadPool.h" +#include "harness/testHarness.h" +#include "harness/kernelHelpers.h" +#include "harness/parseParameters.h" #if !defined(_WIN32) && !defined(__ANDROID__) #include #endif @@ -54,7 +54,7 @@ #if (defined(_WIN32) && defined (_MSC_VER)) // need for _controlfp_s and rouinding modes in RoundingMode -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #endif #pragma mark - diff --git a/test_conformance/d3d10/main.cpp b/test_conformance/d3d10/main.cpp index 44b57680..9c574cca 100644 --- a/test_conformance/d3d10/main.cpp +++ b/test_conformance/d3d10/main.cpp @@ -17,8 +17,8 @@ #define _CRT_SECURE_NO_WARNINGS #include "harness.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/testHarness.h" +#include "harness/parseParameters.h" int main(int argc, const char* argv[]) { diff --git a/test_conformance/d3d11/main.cpp b/test_conformance/d3d11/main.cpp index f477d7bb..24854f0d 100644 --- a/test_conformance/d3d11/main.cpp +++ b/test_conformance/d3d11/main.cpp @@ -19,8 +19,8 @@ #include #include #include "harness.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/testHarness.h" +#include "harness/parseParameters.h" int main(int argc, const char* argv[]) { diff --git a/test_conformance/device_execution/device_info.cpp b/test_conformance/device_execution/device_info.cpp index fa37fe6b..b248c19c 100644 --- a/test_conformance/device_execution/device_info.cpp +++ b/test_conformance/device_execution/device_info.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include "procs.h" #include "utils.h" diff --git a/test_conformance/device_execution/device_queue.cpp b/test_conformance/device_execution/device_queue.cpp index 2a0e3961..e8a4b686 100644 --- a/test_conformance/device_execution/device_queue.cpp +++ b/test_conformance/device_execution/device_queue.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/enqueue_block.cpp b/test_conformance/device_execution/enqueue_block.cpp index b3966e57..29a6cec1 100644 --- a/test_conformance/device_execution/enqueue_block.cpp +++ b/test_conformance/device_execution/enqueue_block.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/enqueue_flags.cpp b/test_conformance/device_execution/enqueue_flags.cpp index 6dd4e122..53e8111c 100644 --- a/test_conformance/device_execution/enqueue_flags.cpp +++ b/test_conformance/device_execution/enqueue_flags.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/enqueue_multi_queue.cpp b/test_conformance/device_execution/enqueue_multi_queue.cpp index 76d69168..5dacb73b 100644 --- a/test_conformance/device_execution/enqueue_multi_queue.cpp +++ b/test_conformance/device_execution/enqueue_multi_queue.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/enqueue_ndrange.cpp b/test_conformance/device_execution/enqueue_ndrange.cpp index 0055b618..84ac339f 100644 --- a/test_conformance/device_execution/enqueue_ndrange.cpp +++ b/test_conformance/device_execution/enqueue_ndrange.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/enqueue_wg_size.cpp b/test_conformance/device_execution/enqueue_wg_size.cpp index e1da04ce..3b575484 100644 --- a/test_conformance/device_execution/enqueue_wg_size.cpp +++ b/test_conformance/device_execution/enqueue_wg_size.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/execute_block.cpp b/test_conformance/device_execution/execute_block.cpp index 99589605..e5b13eff 100644 --- a/test_conformance/device_execution/execute_block.cpp +++ b/test_conformance/device_execution/execute_block.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/host_multi_queue.cpp b/test_conformance/device_execution/host_multi_queue.cpp index 5b572d72..e9a675c3 100644 --- a/test_conformance/device_execution/host_multi_queue.cpp +++ b/test_conformance/device_execution/host_multi_queue.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/host_queue_order.cpp b/test_conformance/device_execution/host_queue_order.cpp index 9161c3a6..3132c23d 100644 --- a/test_conformance/device_execution/host_queue_order.cpp +++ b/test_conformance/device_execution/host_queue_order.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/main.c b/test_conformance/device_execution/main.c index fb058277..6039f126 100644 --- a/test_conformance/device_execution/main.c +++ b/test_conformance/device_execution/main.c @@ -20,8 +20,8 @@ #include #endif -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/testHarness.h" +#include "harness/parseParameters.h" #include "utils.h" #include "procs.h" diff --git a/test_conformance/device_execution/nested_blocks.cpp b/test_conformance/device_execution/nested_blocks.cpp index fd075527..2f6076f4 100644 --- a/test_conformance/device_execution/nested_blocks.cpp +++ b/test_conformance/device_execution/nested_blocks.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include diff --git a/test_conformance/device_execution/procs.h b/test_conformance/device_execution/procs.h index 53b6be41..11fcec9a 100644 --- a/test_conformance/device_execution/procs.h +++ b/test_conformance/device_execution/procs.h @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #ifdef __cplusplus extern "C" { diff --git a/test_conformance/device_execution/utils.cpp b/test_conformance/device_execution/utils.cpp index b349b2d6..66a2211f 100644 --- a/test_conformance/device_execution/utils.cpp +++ b/test_conformance/device_execution/utils.cpp @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include "utils.h" diff --git a/test_conformance/device_execution/utils.h b/test_conformance/device_execution/utils.h index 02d7b6c7..9b30d95f 100644 --- a/test_conformance/device_execution/utils.h +++ b/test_conformance/device_execution/utils.h @@ -16,8 +16,8 @@ #ifndef _utils_h_ #define _utils_h_ -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/testHarness.h" +#include "harness/mt19937.h" #include diff --git a/test_conformance/device_partition/main.c b/test_conformance/device_partition/main.c index 88217b0b..f5f081ea 100644 --- a/test_conformance/device_partition/main.c +++ b/test_conformance/device_partition/main.c @@ -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 #include #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 diff --git a/test_conformance/device_partition/procs.h b/test_conformance/device_partition/procs.h index 7cfd4dc4..1e543daf 100644 --- a/test_conformance/device_partition/procs.h +++ b/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_all(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); diff --git a/test_conformance/device_partition/testBase.h b/test_conformance/device_partition/testBase.h index 5073b21f..5b49bfd7 100644 --- a/test_conformance/device_partition/testBase.h +++ b/test_conformance/device_partition/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/device_partition/test_device_partition.cpp b/test_conformance/device_partition/test_device_partition.cpp index 468cd22b..b90fca85 100644 --- a/test_conformance/device_partition/test_device_partition.cpp +++ b/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" #include diff --git a/test_conformance/device_timer/main.c b/test_conformance/device_timer/main.c index bb8cf96f..01d65722 100644 --- a/test_conformance/device_timer/main.c +++ b/test_conformance/device_timer/main.c @@ -13,11 +13,11 @@ // 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 #include #include -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/device_timer/test_device_timer.c b/test_conformance/device_timer/test_device_timer.c index 7b171c02..c5943fad 100644 --- a/test_conformance/device_timer/test_device_timer.c +++ b/test_conformance/device_timer/test_device_timer.c @@ -15,8 +15,8 @@ // #include #include -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/compat.h" +#include "harness/errorHelpers.h" +#include "harness/compat.h" #if !defined(_WIN32) #include "unistd.h" // For "sleep" diff --git a/test_conformance/events/main.c b/test_conformance/events/main.c index d3cd162a..2aafb0e5 100644 --- a/test_conformance/events/main.c +++ b/test_conformance/events/main.c @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include #endif diff --git a/test_conformance/events/procs.h b/test_conformance/events/procs.h index 216daf77..f077c247 100644 --- a/test_conformance/events/procs.h +++ b/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); diff --git a/test_conformance/events/testBase.h b/test_conformance/events/testBase.h index 5073b21f..5b49bfd7 100644 --- a/test_conformance/events/testBase.h +++ b/test_conformance/events/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/events/test_callbacks.cpp b/test_conformance/events/test_callbacks.cpp index 3286fd6e..2ffb9ca7 100644 --- a/test_conformance/events/test_callbacks.cpp +++ 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 diff --git a/test_conformance/events/test_event_dependencies.cpp b/test_conformance/events/test_event_dependencies.cpp index c0b5c68a..3b80ea6e 100644 --- a/test_conformance/events/test_event_dependencies.cpp +++ b/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" diff --git a/test_conformance/events/test_userevents.cpp b/test_conformance/events/test_userevents.cpp index 39dea376..c660508f 100644 --- a/test_conformance/events/test_userevents.cpp +++ b/test_conformance/events/test_userevents.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "../../test_common/harness/kernelHelpers.h" +#include "harness/kernelHelpers.h" /////////////////////////////////////////////////////////////////////////////// // ATF performance framework. diff --git a/test_conformance/events/test_userevents_multithreaded.cpp b/test_conformance/events/test_userevents_multithreaded.cpp index 6c54e780..23407906 100644 --- a/test_conformance/events/test_userevents_multithreaded.cpp +++ b/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 diff --git a/test_conformance/generic_address_space/advanced_tests.cpp b/test_conformance/generic_address_space/advanced_tests.cpp index 05bd7ae9..f4025fef 100644 --- a/test_conformance/generic_address_space/advanced_tests.cpp +++ b/test_conformance/generic_address_space/advanced_tests.cpp @@ -13,8 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include "base.h" #include diff --git a/test_conformance/generic_address_space/base.h b/test_conformance/generic_address_space/base.h index 5ea71055..44d61fef 100644 --- a/test_conformance/generic_address_space/base.h +++ b/test_conformance/generic_address_space/base.h @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #include diff --git a/test_conformance/generic_address_space/basic_tests.cpp b/test_conformance/generic_address_space/basic_tests.cpp index 56552fac..0b81564d 100644 --- a/test_conformance/generic_address_space/basic_tests.cpp +++ b/test_conformance/generic_address_space/basic_tests.cpp @@ -13,8 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" #include "base.h" #include diff --git a/test_conformance/generic_address_space/main.cpp b/test_conformance/generic_address_space/main.cpp index ab7247c2..112f45c8 100644 --- a/test_conformance/generic_address_space/main.cpp +++ b/test_conformance/generic_address_space/main.cpp @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #include diff --git a/test_conformance/generic_address_space/stress_tests.cpp b/test_conformance/generic_address_space/stress_tests.cpp index 58ceb514..4f94a5d0 100644 --- a/test_conformance/generic_address_space/stress_tests.cpp +++ b/test_conformance/generic_address_space/stress_tests.cpp @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/testHarness.h" +#include "harness/typeWrappers.h" +#include "harness/mt19937.h" #include "base.h" #include diff --git a/test_conformance/geometrics/main.c b/test_conformance/geometrics/main.c index e12d655c..038999de 100644 --- a/test_conformance/geometrics/main.c +++ b/test_conformance/geometrics/main.c @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include #endif diff --git a/test_conformance/geometrics/procs.h b/test_conformance/geometrics/procs.h index cde575e4..44f6f892 100644 --- a/test_conformance/geometrics/procs.h +++ b/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 int create_program_and_kernel(const char *source, const char *kernel_name, cl_program *program_ret, cl_kernel *kernel_ret); diff --git a/test_conformance/geometrics/testBase.h b/test_conformance/geometrics/testBase.h index 5073b21f..5b49bfd7 100644 --- a/test_conformance/geometrics/testBase.h +++ b/test_conformance/geometrics/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/geometrics/test_geometrics.cpp b/test_conformance/geometrics/test_geometrics.cpp index ac16b2a4..2fcf31ce 100644 --- a/test_conformance/geometrics/test_geometrics.cpp +++ b/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 const char *crossKernelSource = diff --git a/test_conformance/geometrics/test_geometrics_double.cpp b/test_conformance/geometrics/test_geometrics_double.cpp index 34bd1933..7dec7514 100644 --- a/test_conformance/geometrics/test_geometrics_double.cpp +++ b/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" diff --git a/test_conformance/gl/main.cpp b/test_conformance/gl/main.cpp index 6338cd7a..77109b87 100644 --- a/test_conformance/gl/main.cpp +++ b/test_conformance/gl/main.cpp @@ -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 #include @@ -23,9 +23,9 @@ #endif #include "procs.h" -#include "../../test_common/gl/setup.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/parseParameters.h" +#include "gl/setup.h" +#include "harness/testHarness.h" +#include "harness/parseParameters.h" #if !defined(_WIN32) #include diff --git a/test_conformance/gl/procs.h b/test_conformance/gl/procs.h index 57c5eefa..b14e22dc 100644 --- a/test_conformance/gl/procs.h +++ b/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 - diff --git a/test_conformance/gl/testBase.h b/test_conformance/gl/testBase.h index 6d445f7c..1ac0f50b 100644 --- a/test_conformance/gl/testBase.h +++ b/test_conformance/gl/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include @@ -25,21 +25,21 @@ #if !defined (__APPLE__) #include -#include "../../test_common/gl/gl_headers.h" +#include "gl/gl_headers.h" #include #else -#include "../../test_common/gl/gl_headers.h" +#include "gl/gl_headers.h" #endif -#include "../../test_common/harness/imageHelpers.h" -#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/imageHelpers.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" extern const char *get_kernel_suffix( cl_image_format *format ); extern const char *get_write_conversion( cl_image_format *format, ExplicitType type); diff --git a/test_conformance/gl/test_buffers.cpp b/test_conformance/gl/test_buffers.cpp index afe7e32e..1a2f2cca 100644 --- a/test_conformance/gl/test_buffers.cpp +++ b/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" #if !defined (__APPLE__) #include diff --git a/test_conformance/gl/test_fence_sync.cpp b/test_conformance/gl/test_fence_sync.cpp index 3a6857bd..e3fd05d6 100644 --- a/test_conformance/gl/test_fence_sync.cpp +++ b/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 diff --git a/test_conformance/gles/main.cpp b/test_conformance/gles/main.cpp index 4d3b353b..fc623dcb 100644 --- a/test_conformance/gles/main.cpp +++ b/test_conformance/gles/main.cpp @@ -28,8 +28,8 @@ #endif #include "procs.h" -#include "../../test_common/gles/setup.h" -#include "../../test_common/harness/testHarness.h" +#include "gles/setup.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/gles/procs.h b/test_conformance/gles/procs.h index 9df80d6c..bc4a1c84 100644 --- a/test_conformance/gles/procs.h +++ b/test_conformance/gles/procs.h @@ -14,7 +14,7 @@ // limitations under the License. // #include "testBase.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/mt19937.h" extern int test_buffers( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements ); diff --git a/test_conformance/gles/setup_egl.cpp b/test_conformance/gles/setup_egl.cpp index c72f7f27..2bb9c088 100644 --- a/test_conformance/gles/setup_egl.cpp +++ b/test_conformance/gles/setup_egl.cpp @@ -15,7 +15,7 @@ // #include "setup.h" #include "testBase.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" #include #include diff --git a/test_conformance/gles/testBase.h b/test_conformance/gles/testBase.h index 2bb59a61..09e8a836 100644 --- a/test_conformance/gles/testBase.h +++ b/test_conformance/gles/testBase.h @@ -30,23 +30,23 @@ #if !defined (__APPLE__) #include -#include "../../test_common/gles/gl_headers.h" +#include "gles/gl_headers.h" #include #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" #ifdef GL_ES_VERSION_2_0 -#include "../../test_common/gles/helpers.h" +#include "gles/helpers.h" #else -#include "../../test_common/gl/helpers.h" +#include "gl/helpers.h" #endif extern const char *get_kernel_suffix( cl_image_format *format ); diff --git a/test_conformance/gles/test_buffers.cpp b/test_conformance/gles/test_buffers.cpp index 31d81d64..8abab0d1 100644 --- a/test_conformance/gles/test_buffers.cpp +++ b/test_conformance/gles/test_buffers.cpp @@ -15,8 +15,8 @@ // #include "testBase.h" #include "testHarness.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" #include #include diff --git a/test_conformance/gles/test_fence_sync.cpp b/test_conformance/gles/test_fence_sync.cpp index 1c117943..7683b9c7 100644 --- a/test_conformance/gles/test_fence_sync.cpp +++ b/test_conformance/gles/test_fence_sync.cpp @@ -17,7 +17,7 @@ #include "testBase.h" #include "setup.h" -#include "../../test_common/harness/genericThread.h" +#include "harness/genericThread.h" #ifndef GLsync // For OpenGL before 3.2, we look for the ARB_sync extension and try to use that diff --git a/test_conformance/half/Test_roundTrip.c b/test_conformance/half/Test_roundTrip.c index 7770593b..c83b412d 100644 --- a/test_conformance/half/Test_roundTrip.c +++ b/test_conformance/half/Test_roundTrip.c @@ -16,7 +16,7 @@ #include #include "cl_utils.h" #include "tests.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" int test_roundTrip( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements ) { diff --git a/test_conformance/half/Test_vLoadHalf.c b/test_conformance/half/Test_vLoadHalf.c index 5c400044..f814dba7 100644 --- a/test_conformance/half/Test_vLoadHalf.c +++ b/test_conformance/half/Test_vLoadHalf.c @@ -13,8 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/compat.h" +#include "harness/testHarness.h" #include #include "cl_utils.h" diff --git a/test_conformance/half/Test_vStoreHalf.c b/test_conformance/half/Test_vStoreHalf.c index 50269bb9..cc27cedd 100644 --- a/test_conformance/half/Test_vStoreHalf.c +++ b/test_conformance/half/Test_vStoreHalf.c @@ -13,9 +13,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/compat.h" +#include "harness/kernelHelpers.h" +#include "harness/testHarness.h" #include #include "cl_utils.h" diff --git a/test_conformance/half/cl_utils.c b/test_conformance/half/cl_utils.c index 7875f1d7..33d0c6ba 100644 --- a/test_conformance/half/cl_utils.c +++ b/test_conformance/half/cl_utils.c @@ -22,9 +22,9 @@ #include "test_config.h" #include "string.h" -#include "../../test_common/harness/kernelHelpers.h" +#include "harness/kernelHelpers.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #define HALF_MIN 1.0p-14 diff --git a/test_conformance/half/cl_utils.h b/test_conformance/half/cl_utils.h index 7df9e9a6..eac20343 100644 --- a/test_conformance/half/cl_utils.h +++ b/test_conformance/half/cl_utils.h @@ -16,8 +16,8 @@ #ifndef CL_UTILS_H #define CL_UTILS_H -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/compat.h" +#include "harness/testHarness.h" +#include "harness/compat.h" #include @@ -29,9 +29,9 @@ #ifdef __MINGW32__ #define __mingw_printf printf #endif -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" -#include "../../test_common/harness/ThreadPool.h" +#include "harness/ThreadPool.h" diff --git a/test_conformance/half/main.c b/test_conformance/half/main.c index a68b5f9e..1e2d1959 100644 --- a/test_conformance/half/main.c +++ b/test_conformance/half/main.c @@ -26,9 +26,9 @@ #include #endif -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/mingw_compat.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/testHarness.h" +#include "harness/mingw_compat.h" +#include "harness/parseParameters.h" #if defined (__MINGW32__) #include #endif diff --git a/test_conformance/headers/test_headers.c b/test_conformance/headers/test_headers.c index 9d40a9fc..1f4bed33 100644 --- a/test_conformance/headers/test_headers.c +++ b/test_conformance/headers/test_headers.c @@ -19,8 +19,8 @@ #include #endif #include -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/errorHelpers.h" +#include "harness/testHarness.h" int test_char( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements ); diff --git a/test_conformance/images/clCopyImage/main.cpp b/test_conformance/images/clCopyImage/main.cpp index 417619eb..853374f6 100644 --- a/test_conformance/images/clCopyImage/main.cpp +++ b/test_conformance/images/clCopyImage/main.cpp @@ -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 #include @@ -24,7 +24,7 @@ #endif #include "../testBase.h" -#include "../../../test_common/harness/testHarness.h" +#include "../harness/testHarness.h" bool gDebugTrace; bool gTestSmallImages; diff --git a/test_conformance/images/clFillImage/main.cpp b/test_conformance/images/clFillImage/main.cpp index 0cb863f2..e96ff0f0 100644 --- a/test_conformance/images/clFillImage/main.cpp +++ b/test_conformance/images/clFillImage/main.cpp @@ -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 #include @@ -24,7 +24,7 @@ #endif #include "../testBase.h" -#include "../../../test_common/harness/testHarness.h" +#include "../harness/testHarness.h" bool gDebugTrace; bool gTestSmallImages; diff --git a/test_conformance/images/clGetInfo/main.cpp b/test_conformance/images/clGetInfo/main.cpp index 3c8d9e95..4cd54782 100644 --- a/test_conformance/images/clGetInfo/main.cpp +++ b/test_conformance/images/clGetInfo/main.cpp @@ -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 #include diff --git a/test_conformance/images/clReadWriteImage/main.cpp b/test_conformance/images/clReadWriteImage/main.cpp index a74b198e..270378f8 100644 --- a/test_conformance/images/clReadWriteImage/main.cpp +++ b/test_conformance/images/clReadWriteImage/main.cpp @@ -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 #include diff --git a/test_conformance/images/kernel_image_methods/main.cpp b/test_conformance/images/kernel_image_methods/main.cpp index d9f6c029..72a92db7 100644 --- a/test_conformance/images/kernel_image_methods/main.cpp +++ b/test_conformance/images/kernel_image_methods/main.cpp @@ -13,8 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../../test_common/harness/compat.h" -#include "../../../test_common/harness/parseParameters.h" +#include "../harness/compat.h" +#include "../harness/parseParameters.h" #include #include diff --git a/test_conformance/images/kernel_read_write/main.cpp b/test_conformance/images/kernel_read_write/main.cpp index 30570b73..178bd2ed 100644 --- a/test_conformance/images/kernel_read_write/main.cpp +++ b/test_conformance/images/kernel_read_write/main.cpp @@ -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 #include @@ -24,8 +24,8 @@ #endif #include "../testBase.h" -#include "../../../test_common/harness/fpcontrol.h" -#include "../../../test_common/harness/parseParameters.h" +#include "../harness/fpcontrol.h" +#include "../harness/parseParameters.h" #include diff --git a/test_conformance/images/samplerlessReads/main.cpp b/test_conformance/images/samplerlessReads/main.cpp index 29295619..d2fc1c07 100644 --- a/test_conformance/images/samplerlessReads/main.cpp +++ b/test_conformance/images/samplerlessReads/main.cpp @@ -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 #include @@ -24,8 +24,8 @@ #endif #include "../testBase.h" -#include "../../../test_common/harness/fpcontrol.h" -#include "../../../test_common/harness/parseParameters.h" +#include "../harness/fpcontrol.h" +#include "../harness/parseParameters.h" #if defined(__PPC__) // Global varaiable used to hold the FPU control register state. The FPSCR register can not diff --git a/test_conformance/images/testBase.h b/test_conformance/images/testBase.h index 8aea7a94..f50f6b5b 100644 --- a/test_conformance/images/testBase.h +++ b/test_conformance/images/testBase.h @@ -16,11 +16,11 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/clImageHelper.h" -#include "../../test_common/harness/imageHelpers.h" +#include "harness/compat.h" +#include "harness/testHarness.h" +#include "harness/kernelHelpers.h" +#include "harness/clImageHelper.h" +#include "harness/imageHelpers.h" // Amount to offset pixels for checking normalized reads #define NORM_OFFSET 0.1f diff --git a/test_conformance/integer_ops/main.c b/test_conformance/integer_ops/main.c index 207bdb09..f15a2afc 100644 --- a/test_conformance/integer_ops/main.c +++ b/test_conformance/integer_ops/main.c @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/integer_ops/procs.h b/test_conformance/integer_ops/procs.h index eb9ec55a..d5b77e70 100644 --- a/test_conformance/integer_ops/procs.h +++ b/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 diff --git a/test_conformance/integer_ops/testBase.h b/test_conformance/integer_ops/testBase.h index 5073b21f..5b49bfd7 100644 --- a/test_conformance/integer_ops/testBase.h +++ b/test_conformance/integer_ops/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/integer_ops/test_abs.c b/test_conformance/integer_ops/test_abs.c index 1a428fb4..10c3a94a 100644 --- a/test_conformance/integer_ops/test_abs.c +++ b/test_conformance/integer_ops/test_abs.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 #include diff --git a/test_conformance/integer_ops/test_absdiff.c b/test_conformance/integer_ops/test_absdiff.c index edfeb723..ba81abda 100644 --- a/test_conformance/integer_ops/test_absdiff.c +++ b/test_conformance/integer_ops/test_absdiff.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 #include diff --git a/test_conformance/integer_ops/test_add_sat.c b/test_conformance/integer_ops/test_add_sat.c index f3fddc2d..48ccca4b 100644 --- a/test_conformance/integer_ops/test_add_sat.c +++ b/test_conformance/integer_ops/test_add_sat.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 #include diff --git a/test_conformance/integer_ops/test_int_basic_ops.c b/test_conformance/integer_ops/test_int_basic_ops.c index 67a39339..2d628d46 100644 --- a/test_conformance/integer_ops/test_int_basic_ops.c +++ b/test_conformance/integer_ops/test_int_basic_ops.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 #include @@ -21,8 +21,8 @@ #include #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 diff --git a/test_conformance/integer_ops/test_integers.cpp b/test_conformance/integer_ops/test_integers.cpp index fa7133cf..620582ca 100644 --- a/test_conformance/integer_ops/test_integers.cpp +++ b/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 diff --git a/test_conformance/integer_ops/test_intmad24.c b/test_conformance/integer_ops/test_intmad24.c index 97526f05..1b1d549c 100644 --- a/test_conformance/integer_ops/test_intmad24.c +++ b/test_conformance/integer_ops/test_intmad24.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 #include diff --git a/test_conformance/integer_ops/test_intmul24.c b/test_conformance/integer_ops/test_intmul24.c index 1b4192bc..0985a6ae 100644 --- a/test_conformance/integer_ops/test_intmul24.c +++ b/test_conformance/integer_ops/test_intmul24.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 #include diff --git a/test_conformance/integer_ops/test_popcount.c b/test_conformance/integer_ops/test_popcount.c index 71c1bf63..a621493c 100644 --- a/test_conformance/integer_ops/test_popcount.c +++ b/test_conformance/integer_ops/test_popcount.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 #include diff --git a/test_conformance/integer_ops/test_sub_sat.c b/test_conformance/integer_ops/test_sub_sat.c index d81a8f41..1856103b 100644 --- a/test_conformance/integer_ops/test_sub_sat.c +++ b/test_conformance/integer_ops/test_sub_sat.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 #include diff --git a/test_conformance/integer_ops/test_unary_ops.cpp b/test_conformance/integer_ops/test_unary_ops.cpp index 06c6cf06..0b4d0b81 100644 --- a/test_conformance/integer_ops/test_unary_ops.cpp +++ b/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 diff --git a/test_conformance/integer_ops/test_upsample.cpp b/test_conformance/integer_ops/test_upsample.cpp index 6e823398..2fbbcc4b 100644 --- a/test_conformance/integer_ops/test_upsample.cpp +++ b/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 diff --git a/test_conformance/integer_ops/verification_and_generation_functions.c b/test_conformance/integer_ops/verification_and_generation_functions.c index f36a1bf4..23f3bdb5 100644 --- a/test_conformance/integer_ops/verification_and_generation_functions.c +++ b/test_conformance/integer_ops/verification_and_generation_functions.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 #include @@ -21,7 +21,7 @@ #include #include "procs.h" -#include "../../test_common/harness/conversions.h" +#include "harness/conversions.h" extern MTdata d; diff --git a/test_conformance/math_brute_force/FunctionList.h b/test_conformance/math_brute_force/FunctionList.h index 32facbd6..bb3fab16 100644 --- a/test_conformance/math_brute_force/FunctionList.h +++ b/test_conformance/math_brute_force/FunctionList.h @@ -16,7 +16,7 @@ #ifndef FUNCTIONLIST_H #define FUNCTIONLIST_H -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #ifndef WIN32 #include @@ -28,7 +28,7 @@ #include #endif -#include "../../test_common/harness/mt19937.h" +#include "harness/mt19937.h" #ifdef __cplusplus extern "C" { diff --git a/test_conformance/math_brute_force/Utility.h b/test_conformance/math_brute_force/Utility.h index e7d27cb7..ffeaff1d 100644 --- a/test_conformance/math_brute_force/Utility.h +++ b/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 @@ -24,10 +24,10 @@ #include #endif #include -#include "../../test_common/harness/rounding_mode.h" -#include "../../test_common/harness/fpcontrol.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/ThreadPool.h" +#include "harness/rounding_mode.h" +#include "harness/fpcontrol.h" +#include "harness/testHarness.h" +#include "harness/ThreadPool.h" #define BUFFER_SIZE (1024*1024*2) #if defined( __GNUC__ ) @@ -91,7 +91,7 @@ extern cl_device_fp_config gDoubleCapabilities; #define vlog_perf( _number, _higherIsBetter, _units, _nameFmt, ... ) ATFLogPerformanceNumber(_number, _higherIsBetter, _units, _nameFmt, __VA_ARGS__ ) #else - #include "../../test_common/harness/errorHelpers.h" + #include "harness/errorHelpers.h" #endif #if defined (_MSC_VER ) diff --git a/test_conformance/math_brute_force/main.c b/test_conformance/math_brute_force/main.c index 61e541d5..4f306ae1 100644 --- a/test_conformance/math_brute_force/main.c +++ b/test_conformance/math_brute_force/main.c @@ -23,9 +23,9 @@ #include "FunctionList.h" #include "Sleep.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/parseParameters.h" #if defined( __APPLE__ ) #include @@ -43,7 +43,7 @@ #include #endif -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #define kPageSize 4096 #define DOUBLE_REQUIRED_FEATURES ( CL_FP_FMA | CL_FP_ROUND_TO_NEAREST | CL_FP_ROUND_TO_ZERO | CL_FP_ROUND_TO_INF | CL_FP_INF_NAN | CL_FP_DENORM ) diff --git a/test_conformance/math_brute_force/reference_math.c b/test_conformance/math_brute_force/reference_math.c index 774ff229..b6df2436 100644 --- a/test_conformance/math_brute_force/reference_math.c +++ b/test_conformance/math_brute_force/reference_math.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 "reference_math.h" #include diff --git a/test_conformance/mem_host_flags/C_host_memory_block.h b/test_conformance/mem_host_flags/C_host_memory_block.h index 90e0b6b3..91b47abf 100644 --- a/test_conformance/mem_host_flags/C_host_memory_block.h +++ b/test_conformance/mem_host_flags/C_host_memory_block.h @@ -16,7 +16,7 @@ #ifndef test_conformance_cHost_MemoryBlock_h #define test_conformance_cHost_MemoryBlock_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/mem_host_flags/checker.h b/test_conformance/mem_host_flags/checker.h index bf2e61b6..06e4c7f0 100644 --- a/test_conformance/mem_host_flags/checker.h +++ b/test_conformance/mem_host_flags/checker.h @@ -16,7 +16,7 @@ #ifndef test_conformance_checkers_h #define test_conformance_checkers_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/mem_host_flags/main.cpp b/test_conformance/mem_host_flags/main.cpp index 46258478..57649d83 100644 --- a/test_conformance/mem_host_flags/main.cpp +++ b/test_conformance/mem_host_flags/main.cpp @@ -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 #include @@ -23,7 +23,7 @@ #endif #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/mem_host_flags/mem_host_buffer.cpp b/test_conformance/mem_host_flags/mem_host_buffer.cpp index 5416ec7f..c4895594 100644 --- a/test_conformance/mem_host_flags/mem_host_buffer.cpp +++ b/test_conformance/mem_host_flags/mem_host_buffer.cpp @@ -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 #include diff --git a/test_conformance/mem_host_flags/mem_host_image.cpp b/test_conformance/mem_host_flags/mem_host_image.cpp index b7eeb003..f6b94c98 100644 --- a/test_conformance/mem_host_flags/mem_host_image.cpp +++ b/test_conformance/mem_host_flags/mem_host_image.cpp @@ -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 #include diff --git a/test_conformance/mem_host_flags/testBase.h b/test_conformance/mem_host_flags/testBase.h index afcdf60e..30dbf749 100644 --- a/test_conformance/mem_host_flags/testBase.h +++ b/test_conformance/mem_host_flags/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include @@ -29,12 +29,12 @@ //#include #endif -#include "../../test_common/harness/imageHelpers.h" -#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/imageHelpers.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" #endif // _testBase_h diff --git a/test_conformance/multiple_device_context/main.c b/test_conformance/multiple_device_context/main.c index 53a7ce8c..10276668 100644 --- a/test_conformance/multiple_device_context/main.c +++ b/test_conformance/multiple_device_context/main.c @@ -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 #include #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 diff --git a/test_conformance/multiple_device_context/procs.h b/test_conformance/multiple_device_context/procs.h index a31db666..fb1aae02 100644 --- a/test_conformance/multiple_device_context/procs.h +++ b/test_conformance/multiple_device_context/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_context_multiple_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); extern int test_context_two_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); diff --git a/test_conformance/multiple_device_context/testBase.h b/test_conformance/multiple_device_context/testBase.h index 5073b21f..5b49bfd7 100644 --- a/test_conformance/multiple_device_context/testBase.h +++ b/test_conformance/multiple_device_context/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/multiple_device_context/test_multiple_contexts.c b/test_conformance/multiple_device_context/test_multiple_contexts.c index 6d163dd1..d5059c18 100644 --- a/test_conformance/multiple_device_context/test_multiple_contexts.c +++ b/test_conformance/multiple_device_context/test_multiple_contexts.c @@ -14,7 +14,7 @@ // limitations under the License. // #include "testBase.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" const char *context_test_kernels[] = { "__kernel void sample_test_1(__global int *src, __global int *dst)\n" diff --git a/test_conformance/multiple_device_context/test_multiple_devices.cpp b/test_conformance/multiple_device_context/test_multiple_devices.cpp index 3f4b78c4..b1869494 100644 --- a/test_conformance/multiple_device_context/test_multiple_devices.cpp +++ b/test_conformance/multiple_device_context/test_multiple_devices.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" diff --git a/test_conformance/non_uniform_work_group/main.cpp b/test_conformance/non_uniform_work_group/main.cpp index 46165c11..7fb05fac 100644 --- a/test_conformance/non_uniform_work_group/main.cpp +++ b/test_conformance/non_uniform_work_group/main.cpp @@ -15,7 +15,7 @@ // #include "procs.h" #include "tools.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #include "TestNonUniformWorkGroup.h" test_definition test_list[] = { diff --git a/test_conformance/non_uniform_work_group/procs.h b/test_conformance/non_uniform_work_group/procs.h index 199bb836..cb49e87f 100644 --- a/test_conformance/non_uniform_work_group/procs.h +++ b/test_conformance/non_uniform_work_group/procs.h @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/typeWrappers.h" +#include "harness/typeWrappers.h" extern int test_non_uniform_1d_basic(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); extern int test_non_uniform_1d_atomics(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); diff --git a/test_conformance/non_uniform_work_group/tools.cpp b/test_conformance/non_uniform_work_group/tools.cpp index ef732d9d..9c0f8f6d 100644 --- a/test_conformance/non_uniform_work_group/tools.cpp +++ b/test_conformance/non_uniform_work_group/tools.cpp @@ -15,7 +15,7 @@ // #include "tools.h" #include -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" PrimeNumbersCollection PrimeNumbers::primeNumbers; // Method generates prime numbers using Sieve of Eratosthenes algorithm diff --git a/test_conformance/pipes/main.c b/test_conformance/pipes/main.c index 019507db..2165c1cc 100644 --- a/test_conformance/pipes/main.c +++ b/test_conformance/pipes/main.c @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" test_definition test_list[] = { ADD_TEST( pipe_readwrite_int ), diff --git a/test_conformance/pipes/procs.h b/test_conformance/pipes/procs.h index 39c1e5c4..5cbe7952 100644 --- a/test_conformance/pipes/procs.h +++ b/test_conformance/pipes/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 diff --git a/test_conformance/pipes/test_pipe_limits.c b/test_conformance/pipes/test_pipe_limits.c index 2c3ad581..29199df6 100644 --- a/test_conformance/pipes/test_pipe_limits.c +++ b/test_conformance/pipes/test_pipe_limits.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 #include @@ -22,7 +22,7 @@ #include #include "procs.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" #define STRING_LENGTH 1024 diff --git a/test_conformance/pipes/test_pipe_query_functions.c b/test_conformance/pipes/test_pipe_query_functions.c index ce3baafd..c1b4d922 100644 --- a/test_conformance/pipes/test_pipe_query_functions.c +++ b/test_conformance/pipes/test_pipe_query_functions.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 #include @@ -21,7 +21,7 @@ #include #include "procs.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" #define TEST_PRIME_INT ((1<<16)+1) diff --git a/test_conformance/pipes/test_pipe_read_write.c b/test_conformance/pipes/test_pipe_read_write.c index 9191aa0f..91a49909 100644 --- a/test_conformance/pipes/test_pipe_read_write.c +++ b/test_conformance/pipes/test_pipe_read_write.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 #include @@ -23,7 +23,7 @@ #include "procs.h" #include "kernels.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" #ifndef uchar typedef unsigned char uchar; diff --git a/test_conformance/pipes/test_pipe_readwrite_errors.c b/test_conformance/pipes/test_pipe_readwrite_errors.c index f4051d35..cdfaf5e8 100644 --- a/test_conformance/pipes/test_pipe_readwrite_errors.c +++ b/test_conformance/pipes/test_pipe_readwrite_errors.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 #include @@ -21,7 +21,7 @@ #include #include "procs.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" const char* pipe_readwrite_errors_kernel_code = { "__kernel void test_pipe_write_error(__global int *src, __write_only pipe int out_pipe, __global int *status)\n" diff --git a/test_conformance/pipes/test_pipe_subgroups.c b/test_conformance/pipes/test_pipe_subgroups.c index 6f8615da..35519b05 100644 --- a/test_conformance/pipes/test_pipe_subgroups.c +++ b/test_conformance/pipes/test_pipe_subgroups.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 #include @@ -22,7 +22,7 @@ #include #include "procs.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" #define TEST_INT_VALUE 100 const char* pipe_subgroups_kernel_code = { diff --git a/test_conformance/printf/test_printf.c b/test_conformance/printf/test_printf.c index bc01b7d7..29f1babb 100644 --- a/test_conformance/printf/test_printf.c +++ b/test_conformance/printf/test_printf.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 #include @@ -37,11 +37,11 @@ #define streamDup2(fd1,fd2) _dup2(fd1,fd2) #endif -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/mt19937.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/mt19937.h" +#include "harness/parseParameters.h" typedef unsigned int uint32_t; diff --git a/test_conformance/printf/test_printf.h b/test_conformance/printf/test_printf.h index 5ae518f5..dac69a7c 100644 --- a/test_conformance/printf/test_printf.h +++ b/test_conformance/printf/test_printf.h @@ -16,7 +16,7 @@ #ifndef TESTPRINTF_INCLUDED_H #define TESTPRINTF_INCLUDED_H -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/printf/util_printf.c b/test_conformance/printf/util_printf.c index f9f72e51..dbf604a7 100644 --- a/test_conformance/printf/util_printf.c +++ b/test_conformance/printf/util_printf.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 "test_printf.h" diff --git a/test_conformance/profiling/copy.c b/test_conformance/profiling/copy.c index 31e3afb8..97e729e0 100644 --- a/test_conformance/profiling/copy.c +++ b/test_conformance/profiling/copy.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 #include @@ -21,9 +21,9 @@ #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/conversions.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" +#include "harness/conversions.h" //--- the code for the kernel executables static const char *write_kernel_code = diff --git a/test_conformance/profiling/execute.c b/test_conformance/profiling/execute.c index 8bdc5e4a..424dbf92 100644 --- a/test_conformance/profiling/execute.c +++ b/test_conformance/profiling/execute.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 #include @@ -22,8 +22,8 @@ #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" #ifndef uchar typedef unsigned char uchar; diff --git a/test_conformance/profiling/execute_multipass.c b/test_conformance/profiling/execute_multipass.c index 9ca5df29..129952f9 100644 --- a/test_conformance/profiling/execute_multipass.c +++ b/test_conformance/profiling/execute_multipass.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 #include @@ -22,8 +22,8 @@ #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" static const char *read3d_kernel_code = "\n" diff --git a/test_conformance/profiling/main.c b/test_conformance/profiling/main.c index 77213a20..145e102e 100644 --- a/test_conformance/profiling/main.c +++ b/test_conformance/profiling/main.c @@ -13,14 +13,14 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" -// FIXME: To use certain functions in ../../test_common/harness/imageHelpers.h +// FIXME: To use certain functions in harness/imageHelpers.h // (for example, generate_random_image_data()), the tests are required to declare // the following variables (): cl_device_type gDeviceType = CL_DEVICE_TYPE_DEFAULT; diff --git a/test_conformance/profiling/procs.h b/test_conformance/profiling/procs.h index b3d4e675..cc7083d0 100644 --- a/test_conformance/profiling/procs.h +++ b/test_conformance/profiling/procs.h @@ -16,10 +16,10 @@ #ifndef __PROCS_H__ #define __PROCS_H__ -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/imageHelpers.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/imageHelpers.h" +#include "harness/mt19937.h" extern int check_times(cl_ulong queueStart, cl_ulong submitStart, cl_ulong commandStart, cl_ulong commandEnd, cl_device_id device); diff --git a/test_conformance/profiling/readArray.c b/test_conformance/profiling/readArray.c index 4b4033f0..04bccbfb 100644 --- a/test_conformance/profiling/readArray.c +++ b/test_conformance/profiling/readArray.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 #include @@ -22,7 +22,7 @@ #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #define TEST_PRIME_INT ((1<<16)+1) #define TEST_PRIME_UINT ((1U<<16)+1U) diff --git a/test_conformance/profiling/readImage.c b/test_conformance/profiling/readImage.c index e7fec12f..c1a08942 100644 --- a/test_conformance/profiling/readImage.c +++ b/test_conformance/profiling/readImage.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 #include @@ -21,8 +21,8 @@ #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" //--- the code for the kernel executables static const char *readKernelCode[] = { diff --git a/test_conformance/profiling/writeArray.c b/test_conformance/profiling/writeArray.c index a984a125..550294a6 100644 --- a/test_conformance/profiling/writeArray.c +++ b/test_conformance/profiling/writeArray.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 #include @@ -21,9 +21,9 @@ #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/conversions.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" +#include "harness/conversions.h" //#define USE_LOCAL_THREADS 1 diff --git a/test_conformance/profiling/writeImage.c b/test_conformance/profiling/writeImage.c index fe77775c..5085896a 100644 --- a/test_conformance/profiling/writeImage.c +++ b/test_conformance/profiling/writeImage.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 #include @@ -21,8 +21,8 @@ #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" //--- the code for the kernel executables static const char *readKernelCode[] = { diff --git a/test_conformance/relationals/main.c b/test_conformance/relationals/main.c index d91c2ae3..ec495c89 100644 --- a/test_conformance/relationals/main.c +++ b/test_conformance/relationals/main.c @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/relationals/procs.h b/test_conformance/relationals/procs.h index 5ee78b8a..80000ef4 100644 --- a/test_conformance/relationals/procs.h +++ b/test_conformance/relationals/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/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" // The number of errors to print out for each test in the shuffle tests #define MAX_ERRORS_TO_PRINT 1 diff --git a/test_conformance/relationals/testBase.h b/test_conformance/relationals/testBase.h index 5073b21f..5b49bfd7 100644 --- a/test_conformance/relationals/testBase.h +++ b/test_conformance/relationals/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/relationals/test_comparisons_double.cpp b/test_conformance/relationals/test_comparisons_double.cpp index 21d4d575..a2f272cf 100644 --- a/test_conformance/relationals/test_comparisons_double.cpp +++ b/test_conformance/relationals/test_comparisons_double.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" extern "C" { extern cl_uint gRandomSeed; }; diff --git a/test_conformance/relationals/test_comparisons_float.cpp b/test_conformance/relationals/test_comparisons_float.cpp index 76b31989..965d6151 100644 --- a/test_conformance/relationals/test_comparisons_float.cpp +++ b/test_conformance/relationals/test_comparisons_float.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" extern "C" { extern cl_uint gRandomSeed;}; diff --git a/test_conformance/relationals/test_relationals.cpp b/test_conformance/relationals/test_relationals.cpp index 9542b851..09c202d9 100644 --- a/test_conformance/relationals/test_relationals.cpp +++ b/test_conformance/relationals/test_relationals.cpp @@ -14,9 +14,9 @@ // limitations under the License. // #include "testBase.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" +#include "harness/testHarness.h" const char *anyAllTestKernelPattern = "%s\n" // optional pragma diff --git a/test_conformance/relationals/test_shuffles.cpp b/test_conformance/relationals/test_shuffles.cpp index 81465fc1..7e72d87a 100644 --- a/test_conformance/relationals/test_shuffles.cpp +++ b/test_conformance/relationals/test_shuffles.cpp @@ -14,9 +14,9 @@ // limitations under the License. // #include "testBase.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" +#include "harness/testHarness.h" // #define USE_NEW_SYNTAX 1 // The number of shuffles to test per test diff --git a/test_conformance/select/test_select.c b/test_conformance/select/test_select.c index 0224394c..ab139986 100644 --- a/test_conformance/select/test_select.c +++ b/test_conformance/select/test_select.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 #include @@ -27,10 +27,10 @@ #include #include "test_select.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/mt19937.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/testHarness.h" +#include "harness/kernelHelpers.h" +#include "harness/mt19937.h" +#include "harness/parseParameters.h" //----------------------------------------- diff --git a/test_conformance/select/test_select.h b/test_conformance/select/test_select.h index a0edcf29..752cd10c 100644 --- a/test_conformance/select/test_select.h +++ b/test_conformance/select/test_select.h @@ -16,7 +16,7 @@ #ifndef TESTSELECTS_INCLUDED_H #define TESTSELECTS_INCLUDED_H -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/select/util_select.c b/test_conformance/select/util_select.c index 59a9dc82..1a7aa07a 100644 --- a/test_conformance/select/util_select.c +++ b/test_conformance/select/util_select.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 #include "test_select.h" diff --git a/test_conformance/spir/datagen.cpp b/test_conformance/spir/datagen.cpp index 1bd21fa6..15e38160 100644 --- a/test_conformance/spir/datagen.cpp +++ b/test_conformance/spir/datagen.cpp @@ -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 "exceptions.h" #include "datagen.h" diff --git a/test_conformance/spir/datagen.h b/test_conformance/spir/datagen.h index 3b8ba5b8..739fb5c6 100644 --- a/test_conformance/spir/datagen.h +++ b/test_conformance/spir/datagen.h @@ -16,7 +16,7 @@ #ifndef __DATAGEN_H #define __DATAGEN_H -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include @@ -27,7 +27,7 @@ #include #include -#include "../../test_common/harness/mt19937.h" +#include "harness/mt19937.h" #include "exceptions.h" #include "kernelargs.h" diff --git a/test_conformance/spir/exceptions.h b/test_conformance/spir/exceptions.h index 61215102..957bef79 100644 --- a/test_conformance/spir/exceptions.h +++ b/test_conformance/spir/exceptions.h @@ -17,7 +17,7 @@ #define __EXCEPTIONS_H #include -#include "../../test_common/miniz/miniz.h" +#include "miniz/miniz.h" namespace Exceptions { diff --git a/test_conformance/spir/kernelargs.cpp b/test_conformance/spir/kernelargs.cpp index d9a216ee..228dc00f 100644 --- a/test_conformance/spir/kernelargs.cpp +++ b/test_conformance/spir/kernelargs.cpp @@ -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 "kernelargs.h" #include "datagen.h" diff --git a/test_conformance/spir/kernelargs.h b/test_conformance/spir/kernelargs.h index 6ba6e8e7..2aa86d7a 100644 --- a/test_conformance/spir/kernelargs.h +++ b/test_conformance/spir/kernelargs.h @@ -29,7 +29,7 @@ #include #include -#include "../../test_common/harness/typeWrappers.h" +#include "harness/typeWrappers.h" #include "exceptions.h" diff --git a/test_conformance/spir/main.cpp b/test_conformance/spir/main.cpp index b44c8cbc..f75277a2 100644 --- a/test_conformance/spir/main.cpp +++ b/test_conformance/spir/main.cpp @@ -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 #include @@ -23,10 +23,10 @@ #include #include -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/os_helpers.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/typeWrappers.h" +#include "harness/os_helpers.h" #include "exceptions.h" #include "run_build_test.h" @@ -34,7 +34,7 @@ #include #include -#include "../../test_common/miniz/miniz.h" +#include "miniz/miniz.h" #if defined(_WIN32) #include diff --git a/test_conformance/spir/run_build_test.cpp b/test_conformance/spir/run_build_test.cpp index 71fd8dbc..b13282da 100644 --- a/test_conformance/spir/run_build_test.cpp +++ b/test_conformance/spir/run_build_test.cpp @@ -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" #ifdef __APPLE__ #include @@ -27,11 +27,11 @@ #include #include -#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/os_helpers.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/typeWrappers.h" +#include "harness/clImageHelper.h" +#include "harness/os_helpers.h" #include "exceptions.h" #include "kernelargs.h" diff --git a/test_conformance/spir/run_services.cpp b/test_conformance/spir/run_services.cpp index e6b0b4f6..521156bf 100644 --- a/test_conformance/spir/run_services.cpp +++ b/test_conformance/spir/run_services.cpp @@ -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" #ifdef __APPLE__ #include diff --git a/test_conformance/spirv_new/procs.h b/test_conformance/spirv_new/procs.h index 1abe49e6..aa44cdda 100644 --- a/test_conformance/spirv_new/procs.h +++ b/test_conformance/spirv_new/procs.h @@ -13,14 +13,14 @@ or Khronos Conformance Test Source License Agreement as executed between Khronos #pragma once -#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 "../../test_common/harness/compat.h" -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/mt19937.h" +#include "harness/compat.h" +#include "harness/testHarness.h" +#include "harness/parseParameters.h" #include diff --git a/test_conformance/spirv_new/testBase.h b/test_conformance/spirv_new/testBase.h index 098e896c..1bcd6df5 100644 --- a/test_conformance/spirv_new/testBase.h +++ b/test_conformance/spirv_new/testBase.h @@ -15,8 +15,8 @@ or Khronos Conformance Test Source License Agreement as executed between Khronos #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/rounding_mode.h" +#include "harness/compat.h" +#include "harness/rounding_mode.h" #include #include diff --git a/test_conformance/subgroups/main.cpp b/test_conformance/subgroups/main.cpp index 6863634e..cf7e73f3 100644 --- a/test_conformance/subgroups/main.cpp +++ b/test_conformance/subgroups/main.cpp @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" MTdata gMTdata; diff --git a/test_conformance/subgroups/procs.h b/test_conformance/subgroups/procs.h index 731ad3b6..1be2508c 100644 --- a/test_conformance/subgroups/procs.h +++ b/test_conformance/subgroups/procs.h @@ -16,13 +16,13 @@ #ifndef _procs_h #define _procs_h -#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/threadTesting.h" -#include "../../test_common/harness/typeWrappers.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/threadTesting.h" +#include "harness/typeWrappers.h" +#include "harness/mt19937.h" extern MTdata gMTdata; diff --git a/test_conformance/subgroups/test_barrier.cpp b/test_conformance/subgroups/test_barrier.cpp index 3b4a0f99..c3f20da0 100644 --- a/test_conformance/subgroups/test_barrier.cpp +++ b/test_conformance/subgroups/test_barrier.cpp @@ -15,8 +15,8 @@ // #include "procs.h" #include "subhelpers.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" static const char * lbar_source = "__kernel void test_lbar(const __global Type *in, __global int2 *xy, __global Type *out)\n" diff --git a/test_conformance/subgroups/test_workgroup.cpp b/test_conformance/subgroups/test_workgroup.cpp index ee7693d3..2230a6f6 100644 --- a/test_conformance/subgroups/test_workgroup.cpp +++ b/test_conformance/subgroups/test_workgroup.cpp @@ -15,8 +15,8 @@ // #include "procs.h" #include "subhelpers.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" static const char * any_source = "__kernel void test_any(const __global Type *in, __global int2 *xy, __global Type *out)\n" diff --git a/test_conformance/subgroups/test_workitem.cpp b/test_conformance/subgroups/test_workitem.cpp index e18d4ab9..7bd81cdc 100644 --- a/test_conformance/subgroups/test_workitem.cpp +++ b/test_conformance/subgroups/test_workitem.cpp @@ -14,8 +14,8 @@ // limitations under the License. // #include "procs.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" struct get_test_data { cl_uint subGroupSize; diff --git a/test_conformance/thread_dimensions/main.c b/test_conformance/thread_dimensions/main.c index e6c7b355..bddbc0f9 100644 --- a/test_conformance/thread_dimensions/main.c +++ b/test_conformance/thread_dimensions/main.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 #include diff --git a/test_conformance/thread_dimensions/procs.h b/test_conformance/thread_dimensions/procs.h index ea2c6949..d01d3c50 100644 --- a/test_conformance/thread_dimensions/procs.h +++ b/test_conformance/thread_dimensions/procs.h @@ -13,11 +13,11 @@ // 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/conversions.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/kernelHelpers.h" +#include "harness/testHarness.h" +#include "harness/errorHelpers.h" +#include "harness/conversions.h" +#include "harness/mt19937.h" extern const int kVectorSizeCount; diff --git a/test_conformance/thread_dimensions/test_thread_dimensions.c b/test_conformance/thread_dimensions/test_thread_dimensions.c index c7ec5e59..137efa4b 100644 --- a/test_conformance/thread_dimensions/test_thread_dimensions.c +++ b/test_conformance/thread_dimensions/test_thread_dimensions.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 #include diff --git a/test_conformance/vec_align/defines.h b/test_conformance/vec_align/defines.h index 69d9f5fb..f2bf9e78 100644 --- a/test_conformance/vec_align/defines.h +++ b/test_conformance/vec_align/defines.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/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" // 1,2,3,4,8,16 or diff --git a/test_conformance/vec_align/main.c b/test_conformance/vec_align/main.c index 46c872d9..6894895a 100644 --- a/test_conformance/vec_align/main.c +++ b/test_conformance/vec_align/main.c @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/vec_align/procs.h b/test_conformance/vec_align/procs.h index 595938b3..7b60e1eb 100644 --- a/test_conformance/vec_align/procs.h +++ b/test_conformance/vec_align/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/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" // The number of errors to print out for each test in the shuffle tests #define MAX_ERRORS_TO_PRINT 1 diff --git a/test_conformance/vec_align/structs.h b/test_conformance/vec_align/structs.h index 09c6d367..e26b8105 100644 --- a/test_conformance/vec_align/structs.h +++ b/test_conformance/vec_align/structs.h @@ -16,8 +16,8 @@ #include "testBase.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" typedef struct _clState { diff --git a/test_conformance/vec_align/testBase.h b/test_conformance/vec_align/testBase.h index 00dcc07b..bd72e841 100644 --- a/test_conformance/vec_align/testBase.h +++ b/test_conformance/vec_align/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/vec_align/test_vec_align.c b/test_conformance/vec_align/test_vec_align.c index 775dc3ed..bc666a48 100644 --- a/test_conformance/vec_align/test_vec_align.c +++ b/test_conformance/vec_align/test_vec_align.c @@ -16,9 +16,9 @@ #include "testBase.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" +#include "harness/testHarness.h" #include "structs.h" diff --git a/test_conformance/vec_step/defines.h b/test_conformance/vec_step/defines.h index 47af57ed..5f364e41 100644 --- a/test_conformance/vec_step/defines.h +++ b/test_conformance/vec_step/defines.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/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" // 1,2,3,4,8,16 or diff --git a/test_conformance/vec_step/main.c b/test_conformance/vec_step/main.c index 21bffda8..9742a28f 100644 --- a/test_conformance/vec_step/main.c +++ b/test_conformance/vec_step/main.c @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/vec_step/procs.h b/test_conformance/vec_step/procs.h index c7461e17..382a36b7 100644 --- a/test_conformance/vec_step/procs.h +++ b/test_conformance/vec_step/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/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" // The number of errors to print out for each test in the shuffle tests #define MAX_ERRORS_TO_PRINT 1 diff --git a/test_conformance/vec_step/structs.h b/test_conformance/vec_step/structs.h index e9a4cdc3..37e5524d 100644 --- a/test_conformance/vec_step/structs.h +++ b/test_conformance/vec_step/structs.h @@ -16,8 +16,8 @@ #include "testBase.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" typedef struct _clState { diff --git a/test_conformance/vec_step/testBase.h b/test_conformance/vec_step/testBase.h index 00dcc07b..bd72e841 100644 --- a/test_conformance/vec_step/testBase.h +++ b/test_conformance/vec_step/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/vec_step/test_step.c b/test_conformance/vec_step/test_step.c index 89291abe..20dbbef3 100644 --- a/test_conformance/vec_step/test_step.c +++ b/test_conformance/vec_step/test_step.c @@ -16,9 +16,9 @@ #include "testBase.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" +#include "harness/testHarness.h" #include "structs.h" diff --git a/test_conformance/workgroups/main.c b/test_conformance/workgroups/main.c index 909137c6..cf8a8258 100644 --- a/test_conformance/workgroups/main.c +++ b/test_conformance/workgroups/main.c @@ -13,12 +13,12 @@ // 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 #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include #endif diff --git a/test_conformance/workgroups/procs.h b/test_conformance/workgroups/procs.h index 0f919148..2e6e79e2 100644 --- a/test_conformance/workgroups/procs.h +++ b/test_conformance/workgroups/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" extern int create_program_and_kernel(const char *source, const char *kernel_name, cl_program *program_ret, cl_kernel *kernel_ret); diff --git a/test_conformance/workgroups/testBase.h b/test_conformance/workgroups/testBase.h index 5073b21f..5b49bfd7 100644 --- a/test_conformance/workgroups/testBase.h +++ b/test_conformance/workgroups/testBase.h @@ -16,7 +16,7 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #include diff --git a/test_conformance/workgroups/test_wg_all.c b/test_conformance/workgroups/test_wg_all.c index c0237f99..33ebe993 100644 --- a/test_conformance/workgroups/test_wg_all.c +++ b/test_conformance/workgroups/test_wg_all.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 #include diff --git a/test_conformance/workgroups/test_wg_any.c b/test_conformance/workgroups/test_wg_any.c index a5c14f44..cd1ebffc 100644 --- a/test_conformance/workgroups/test_wg_any.c +++ b/test_conformance/workgroups/test_wg_any.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 #include diff --git a/test_conformance/workgroups/test_wg_broadcast.c b/test_conformance/workgroups/test_wg_broadcast.c index c9986d9f..df4263b9 100644 --- a/test_conformance/workgroups/test_wg_broadcast.c +++ b/test_conformance/workgroups/test_wg_broadcast.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 #include diff --git a/test_conformance/workgroups/test_wg_reduce.c b/test_conformance/workgroups/test_wg_reduce.c index 0f1fa920..92a5165e 100644 --- a/test_conformance/workgroups/test_wg_reduce.c +++ b/test_conformance/workgroups/test_wg_reduce.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 #include diff --git a/test_conformance/workgroups/test_wg_reduce_max.c b/test_conformance/workgroups/test_wg_reduce_max.c index 4bebe81f..7f37b5ad 100644 --- a/test_conformance/workgroups/test_wg_reduce_max.c +++ b/test_conformance/workgroups/test_wg_reduce_max.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 #include diff --git a/test_conformance/workgroups/test_wg_reduce_min.c b/test_conformance/workgroups/test_wg_reduce_min.c index 582a7608..9d929c81 100644 --- a/test_conformance/workgroups/test_wg_reduce_min.c +++ b/test_conformance/workgroups/test_wg_reduce_min.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 #include diff --git a/test_conformance/workgroups/test_wg_scan_exclusive_add.c b/test_conformance/workgroups/test_wg_scan_exclusive_add.c index e82ac4c9..40c50c8c 100644 --- a/test_conformance/workgroups/test_wg_scan_exclusive_add.c +++ b/test_conformance/workgroups/test_wg_scan_exclusive_add.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 #include diff --git a/test_conformance/workgroups/test_wg_scan_exclusive_max.c b/test_conformance/workgroups/test_wg_scan_exclusive_max.c index 5b68cada..7f37acd2 100644 --- a/test_conformance/workgroups/test_wg_scan_exclusive_max.c +++ b/test_conformance/workgroups/test_wg_scan_exclusive_max.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 #include diff --git a/test_conformance/workgroups/test_wg_scan_exclusive_min.c b/test_conformance/workgroups/test_wg_scan_exclusive_min.c index 03ec3587..61110533 100644 --- a/test_conformance/workgroups/test_wg_scan_exclusive_min.c +++ b/test_conformance/workgroups/test_wg_scan_exclusive_min.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 #include diff --git a/test_conformance/workgroups/test_wg_scan_inclusive_add.c b/test_conformance/workgroups/test_wg_scan_inclusive_add.c index 1ac2f7f8..9546794b 100644 --- a/test_conformance/workgroups/test_wg_scan_inclusive_add.c +++ b/test_conformance/workgroups/test_wg_scan_inclusive_add.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 #include diff --git a/test_conformance/workgroups/test_wg_scan_inclusive_max.c b/test_conformance/workgroups/test_wg_scan_inclusive_max.c index bb1e9961..23d518c8 100644 --- a/test_conformance/workgroups/test_wg_scan_inclusive_max.c +++ b/test_conformance/workgroups/test_wg_scan_inclusive_max.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 #include diff --git a/test_conformance/workgroups/test_wg_scan_inclusive_min.c b/test_conformance/workgroups/test_wg_scan_inclusive_min.c index 707f04d9..f4c788f5 100644 --- a/test_conformance/workgroups/test_wg_scan_inclusive_min.c +++ b/test_conformance/workgroups/test_wg_scan_inclusive_min.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 #include diff --git a/test_extensions/media_sharing/main.cpp b/test_extensions/media_sharing/main.cpp index 32097372..c697365f 100644 --- a/test_extensions/media_sharing/main.cpp +++ b/test_extensions/media_sharing/main.cpp @@ -16,7 +16,7 @@ #include #include -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #include "utils.h" #include "procs.h" diff --git a/test_extensions/media_sharing/test_functions_kernel.cpp b/test_extensions/media_sharing/test_functions_kernel.cpp index 51ac0b70..f5c3e2da 100644 --- a/test_extensions/media_sharing/test_functions_kernel.cpp +++ b/test_extensions/media_sharing/test_functions_kernel.cpp @@ -16,8 +16,8 @@ #include #include -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" #include "utils.h" diff --git a/test_extensions/media_sharing/test_other_data_types.cpp b/test_extensions/media_sharing/test_other_data_types.cpp index a2aa7cbd..3a667255 100644 --- a/test_extensions/media_sharing/test_other_data_types.cpp +++ b/test_extensions/media_sharing/test_other_data_types.cpp @@ -16,8 +16,8 @@ #include #include -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" #include "utils.h" diff --git a/test_extensions/media_sharing/utils.cpp b/test_extensions/media_sharing/utils.cpp index 41899b76..a2d8f39f 100644 --- a/test_extensions/media_sharing/utils.cpp +++ b/test_extensions/media_sharing/utils.cpp @@ -15,8 +15,8 @@ // #include "utils.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/rounding_mode.h" +#include "harness/errorHelpers.h" +#include "harness/rounding_mode.h" #include diff --git a/test_extensions/media_sharing/utils.h b/test_extensions/media_sharing/utils.h index 4e489b34..d44761b4 100644 --- a/test_extensions/media_sharing/utils.h +++ b/test_extensions/media_sharing/utils.h @@ -23,7 +23,7 @@ #include "wrappers.h" #include "CL/cl_dx9_media_sharing.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/typeWrappers.h" diff --git a/test_extensions/media_sharing/wrappers.cpp b/test_extensions/media_sharing/wrappers.cpp index af13633b..e7eb5b2b 100644 --- a/test_extensions/media_sharing/wrappers.cpp +++ b/test_extensions/media_sharing/wrappers.cpp @@ -14,7 +14,7 @@ // limitations under the License. // #include "wrappers.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/errorHelpers.h" LPCTSTR CDeviceWrapper::WINDOW_TITLE = _T( "cl_khr_dx9_media_sharing" ); const int CDeviceWrapper::WINDOW_WIDTH = 256;