From 45129878ab7882fc0b9855e9ea1f16c29796ac44 Mon Sep 17 00:00:00 2001 From: Kevin Petit Date: Thu, 1 Aug 2019 12:54:59 +0100 Subject: [PATCH] Stop using ../../test_common to include common headers Contributes to #395. Signed-off-by: Kevin Petit --- test_common/gl/helpers.h | 12 ++++++------ test_common/gl/setup_osx.cpp | 2 +- test_common/gl/setup_win32.cpp | 2 +- test_common/gl/setup_x11.cpp | 2 +- test_conformance/CMakeLists.txt | 7 ++++--- .../allocations/allocation_fill.cpp | 2 +- test_conformance/allocations/main.cpp | 2 +- test_conformance/allocations/testBase.h | 8 ++++---- test_conformance/api/main.c | 2 +- test_conformance/api/procs.h | 10 +++++----- test_conformance/api/test_api_min_max.c | 4 ++-- test_conformance/api/test_bool.c | 2 +- .../api/test_create_context_from_type.cpp | 2 +- test_conformance/api/test_create_kernels.c | 2 +- ...vice_min_data_type_align_size_alignment.cpp | 2 +- .../api/test_kernel_arg_multi_setup.cpp | 2 +- test_conformance/api/test_kernels.c | 4 ++-- test_conformance/api/test_mem_object_info.cpp | 4 ++-- test_conformance/api/test_native_kernel.cpp | 2 +- test_conformance/api/test_queries.cpp | 2 +- test_conformance/api/test_queue_properties.cpp | 8 +++++--- test_conformance/api/test_retain_program.c | 2 +- test_conformance/atomics/main.c | 2 +- test_conformance/atomics/procs.h | 8 ++++---- test_conformance/atomics/test_atomics.cpp | 2 +- test_conformance/atomics/test_indexed_cases.c | 2 +- test_conformance/basic/main.c | 2 +- test_conformance/basic/procs.h | 12 ++++++------ test_conformance/basic/test_astype.cpp | 4 ++-- test_conformance/basic/test_async_copy.cpp | 2 +- .../basic/test_async_strided_copy.cpp | 2 +- test_conformance/basic/test_enqueue_map.cpp | 4 ++-- test_conformance/basic/test_explicit_s2v.cpp | 4 ++-- test_conformance/basic/test_fpmath_float.c | 2 +- test_conformance/basic/test_fpmath_float2.c | 2 +- test_conformance/basic/test_fpmath_float4.c | 2 +- test_conformance/basic/test_image_param.c | 6 +++--- .../basic/test_kernel_memory_alignment.cpp | 6 +++--- test_conformance/basic/test_vec_type_hint.c | 4 ++-- .../basic/test_vector_creation.cpp | 6 +++--- test_conformance/basic/test_vloadstore.c | 6 +++--- .../basic/test_work_item_functions.cpp | 4 ++-- test_conformance/buffers/main.c | 2 +- test_conformance/buffers/procs.h | 12 ++++++------ test_conformance/buffers/test_buffer_copy.c | 2 +- test_conformance/buffers/test_buffer_fill.c | 2 +- test_conformance/buffers/test_buffer_map.c | 2 +- test_conformance/buffers/test_buffer_migrate.c | 4 ++-- test_conformance/buffers/test_buffer_write.c | 2 +- test_conformance/buffers/test_image_migrate.c | 2 +- test_conformance/commonfns/main.c | 2 +- test_conformance/commonfns/procs.h | 10 +++++----- test_conformance/commonfns/test_clamp.c | 2 +- test_conformance/commonfns/test_minf.c | 2 +- test_conformance/compiler/main.c | 2 +- test_conformance/compiler/procs.h | 10 +++++----- test_conformance/compiler/test_compile.c | 2 +- test_conformance/computeinfo/main.c | 4 ++-- test_conformance/contractions/CMakeLists.txt | 2 -- test_conformance/contractions/contractions.c | 14 +++++++------- test_conformance/conversions/CMakeLists.txt | 2 -- .../conversions/basic_test_conversions.c | 4 ++-- .../conversions/basic_test_conversions.h | 8 ++++---- .../conversions/test_conversions.c | 12 ++++++------ test_conformance/d3d10/CMakeLists.txt | 3 +-- test_conformance/d3d11/CMakeLists.txt | 3 +-- test_conformance/device_partition/main.c | 4 ++-- test_conformance/device_partition/procs.h | 8 ++++---- .../device_partition/test_device_partition.cpp | 6 +++--- test_conformance/events/main.c | 2 +- test_conformance/events/procs.h | 8 ++++---- test_conformance/events/test_callbacks.cpp | 4 ++-- .../events/test_event_dependencies.cpp | 2 +- .../events/test_userevents_multithreaded.cpp | 4 ++-- test_conformance/geometrics/main.c | 2 +- test_conformance/geometrics/procs.h | 8 ++++---- .../geometrics/test_geometrics.cpp | 10 +++++----- .../geometrics/test_geometrics_double.cpp | 6 +++--- test_conformance/gl/main.cpp | 4 ++-- test_conformance/gl/procs.h | 2 +- test_conformance/gl/testBase.h | 18 +++++++++--------- test_conformance/gl/test_buffers.cpp | 4 ++-- test_conformance/gl/test_fence_sync.cpp | 4 ++-- test_conformance/half/cl_utils.h | 4 ++-- test_conformance/half/main.c | 4 ++-- test_conformance/images/image_helpers.h | 16 ++++++++-------- .../images/kernel_read_write/main.cpp | 2 +- .../images/samplerlessReads/main.cpp | 2 +- test_conformance/images/testBase.h | 6 +++--- test_conformance/integer_ops/main.c | 2 +- test_conformance/integer_ops/procs.h | 12 ++++++------ .../integer_ops/test_int_basic_ops.c | 4 ++-- test_conformance/integer_ops/test_integers.cpp | 2 +- .../integer_ops/test_unary_ops.cpp | 2 +- test_conformance/integer_ops/test_upsample.cpp | 2 +- .../verification_and_generation_functions.c | 2 +- .../math_brute_force/FunctionList.h | 4 ++-- test_conformance/math_brute_force/Utility.h | 10 +++++----- .../math_brute_force/reference_math.c | 2 +- test_conformance/mem_host_flags/main.cpp | 2 +- test_conformance/mem_host_flags/testBase.h | 12 ++++++------ .../multiple_device_context/main.c | 4 ++-- .../multiple_device_context/procs.h | 8 ++++---- .../test_multiple_contexts.c | 2 +- .../test_multiple_devices.cpp | 6 +++--- test_conformance/printf/test_printf.c | 8 ++++---- test_conformance/profiling/copy.c | 6 +++--- test_conformance/profiling/execute.c | 4 ++-- test_conformance/profiling/execute_multipass.c | 4 ++-- test_conformance/profiling/main.c | 2 +- test_conformance/profiling/procs.h | 8 ++++---- test_conformance/profiling/readArray.c | 2 +- test_conformance/profiling/readImage.c | 4 ++-- test_conformance/profiling/writeArray.c | 6 +++--- test_conformance/profiling/writeImage.c | 4 ++-- test_conformance/relationals/main.c | 2 +- test_conformance/relationals/procs.h | 12 ++++++------ .../relationals/test_comparisons_double.cpp | 4 ++-- .../relationals/test_comparisons_float.cpp | 4 ++-- .../relationals/test_relationals.cpp | 4 ++-- test_conformance/relationals/test_shuffles.cpp | 6 +++--- test_conformance/select/test_select.c | 8 ++++---- test_conformance/select/test_select.h | 2 +- test_conformance/spir/datagen.cpp | 2 +- test_conformance/spir/datagen.h | 4 ++-- test_conformance/spir/exceptions.h | 2 +- test_conformance/spir/kernelargs.cpp | 2 +- test_conformance/spir/kernelargs.h | 2 +- test_conformance/spir/main.cpp | 12 ++++++------ test_conformance/spir/run_build_test.cpp | 12 ++++++------ test_conformance/spir/run_services.cpp | 2 +- test_conformance/thread_dimensions/main.c | 2 +- test_conformance/thread_dimensions/procs.h | 10 +++++----- .../thread_dimensions/test_thread_dimensions.c | 2 +- test_conformance/vec_align/defines.h | 12 ++++++------ test_conformance/vec_align/main.c | 2 +- test_conformance/vec_align/procs.h | 12 ++++++------ test_conformance/vec_align/structs.h | 4 ++-- test_conformance/vec_align/test_vec_align.c | 4 ++-- test_conformance/vec_step/defines.h | 12 ++++++------ test_conformance/vec_step/main.c | 2 +- test_conformance/vec_step/procs.h | 12 ++++++------ test_conformance/vec_step/structs.h | 4 ++-- test_conformance/vec_step/test_step.c | 4 ++-- test_extensions/media_sharing/main.cpp | 2 +- .../media_sharing/test_functions_kernel.cpp | 4 ++-- .../media_sharing/test_other_data_types.cpp | 4 ++-- test_extensions/media_sharing/utils.cpp | 4 ++-- test_extensions/media_sharing/utils.h | 2 +- test_extensions/media_sharing/wrappers.cpp | 2 +- 150 files changed, 354 insertions(+), 357 deletions(-) diff --git a/test_common/gl/helpers.h b/test_common/gl/helpers.h index 98455fef..93574601 100644 --- a/test_common/gl/helpers.h +++ b/test_common/gl/helpers.h @@ -36,12 +36,12 @@ #include "gl_headers.h" #endif -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/threadTesting.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/threadTesting.h" +#include "harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/mt19937.h" typedef cl_mem (CL_API_CALL *clCreateFromGLBuffer_fn)(cl_context context, diff --git a/test_common/gl/setup_osx.cpp b/test_common/gl/setup_osx.cpp index f259f8ae..839377f2 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 83f0bb91..b859a08e 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 a06fa060..2c6d5c12 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_conformance/CMakeLists.txt b/test_conformance/CMakeLists.txt index af91bded..abec7bae 100644 --- a/test_conformance/CMakeLists.txt +++ b/test_conformance/CMakeLists.txt @@ -32,9 +32,9 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CTS_EXTRA_FLAGS}") endif() -# Clang gives C++11 narrowing warnings so suppress these for now -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing") +# Suppress narrowing warnings given by Clang and GCC +if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Clang)|(GNU)") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing -Wno-narrowing") endif() if( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" ) @@ -43,6 +43,7 @@ if( WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" ) endif() include_directories(BEFORE SYSTEM ${CLConform_HEADERS}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../test_common) link_directories(${CLConform_LIB_DIR}) add_definitions(-DCL_TARGET_OPENCL_VERSION=120) diff --git a/test_conformance/allocations/allocation_fill.cpp b/test_conformance/allocations/allocation_fill.cpp index 3ccb912a..8fd4c00a 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 15ef7a4d..9855b58d 100644 --- a/test_conformance/allocations/main.cpp +++ b/test_conformance/allocations/main.cpp @@ -18,7 +18,7 @@ #include "allocation_functions.h" #include "allocation_fill.h" #include "allocation_execute.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #include cl_device_id g_device_id; diff --git a/test_conformance/allocations/testBase.h b/test_conformance/allocations/testBase.h index 51fa5544..eb600284 100644 --- a/test_conformance/allocations/testBase.h +++ b/test_conformance/allocations/testBase.h @@ -32,10 +32,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 6ed8fa6d..4bac0442 100644 --- a/test_conformance/api/main.c +++ b/test_conformance/api/main.c @@ -23,7 +23,7 @@ #include #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/api/procs.h b/test_conformance/api/procs.h index 5fdd0eeb..4adaf819 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/test_api_min_max.c b/test_conformance/api/test_api_min_max.c index 0b5e621e..a2bee6ed 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 1ad43d99..a72c76dc 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_create_context_from_type.cpp b/test_conformance/api/test_create_context_from_type.cpp index e61488ad..5d838d70 100644 --- a/test_conformance/api/test_create_context_from_type.cpp +++ b/test_conformance/api/test_create_context_from_type.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_create_kernels.c b/test_conformance/api/test_create_kernels.c index ab63fc9a..96f29667 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 0f8b0a71..dc6b5699 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 a3e5d65b..b7b3f904 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 9dbb73cb..001b19c1 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 bbd3196a..66063869 100644 --- a/test_conformance/api/test_mem_object_info.cpp +++ b/test_conformance/api/test_mem_object_info.cpp @@ -15,8 +15,8 @@ // #include "testBase.h" #include "../images/image_helpers.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/typeWrappers.h" +#include "harness/testHarness.h" extern cl_uint gRandomSeed; diff --git a/test_conformance/api/test_native_kernel.cpp b/test_conformance/api/test_native_kernel.cpp index 73a9c7e5..0bf89108 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_queries.cpp b/test_conformance/api/test_queries.cpp index e0477421..8472504c 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_properties.cpp b/test_conformance/api/test_queue_properties.cpp index 3b368077..7e535cdd 100644 --- a/test_conformance/api/test_queue_properties.cpp +++ b/test_conformance/api/test_queue_properties.cpp @@ -16,12 +16,14 @@ #include "testBase.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/conversions.h" +#include "harness/typeWrappers.h" +#include "harness/conversions.h" #include #include #include +#include + using namespace std; /* The test against cl_khr_create_command_queue extension. It validates if devices with Opencl 1.X can use clCreateCommandQueueWithPropertiesKHR function. @@ -171,4 +173,4 @@ int test_queue_properties(cl_device_id deviceID, cl_context context, cl_command_ } return 0; -} \ No newline at end of file +} diff --git a/test_conformance/api/test_retain_program.c b/test_conformance/api/test_retain_program.c index 22b7974f..786171dd 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/atomics/main.c b/test_conformance/atomics/main.c index dab962f5..b9eaf55e 100644 --- a/test_conformance/atomics/main.c +++ b/test_conformance/atomics/main.c @@ -23,7 +23,7 @@ #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 fed53151..82d9e419 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/test_atomics.cpp b/test_conformance/atomics/test_atomics.cpp index de25ad49..c4b3dd3d 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 e35023e1..210c283d 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 49b59f96..5ecd95fa 100644 --- a/test_conformance/basic/main.c +++ b/test_conformance/basic/main.c @@ -26,7 +26,7 @@ #include #include -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #include "procs.h" basefn basefn_list[] = { diff --git a/test_conformance/basic/procs.h b/test_conformance/basic/procs.h index 8cfde00b..28f6ecc7 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_astype.cpp b/test_conformance/basic/test_astype.cpp index d99898f7..9d2e1c81 100644 --- a/test_conformance/basic/test_astype.cpp +++ b/test_conformance/basic/test_astype.cpp @@ -33,8 +33,8 @@ #include "procs.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" static const char *astype_kernel_pattern = diff --git a/test_conformance/basic/test_async_copy.cpp b/test_conformance/basic/test_async_copy.cpp index 8e9b666c..8621bbb0 100644 --- a/test_conformance/basic/test_async_copy.cpp +++ b/test_conformance/basic/test_async_copy.cpp @@ -28,7 +28,7 @@ #include "procs.h" -#include "../../test_common/harness/conversions.h" +#include "harness/conversions.h" static const char *async_global_to_local_kernel = "%s\n" // optional pragma string diff --git a/test_conformance/basic/test_async_strided_copy.cpp b/test_conformance/basic/test_async_strided_copy.cpp index 7683dce0..7599bad2 100644 --- a/test_conformance/basic/test_async_strided_copy.cpp +++ b/test_conformance/basic/test_async_strided_copy.cpp @@ -28,7 +28,7 @@ #include "procs.h" -#include "../../test_common/harness/conversions.h" +#include "harness/conversions.h" static const char *async_strided_global_to_local_kernel = "%s\n" // optional pragma string diff --git a/test_conformance/basic/test_enqueue_map.cpp b/test_conformance/basic/test_enqueue_map.cpp index 350662a0..8f066cbd 100644 --- a/test_conformance/basic/test_enqueue_map.cpp +++ b/test_conformance/basic/test_enqueue_map.cpp @@ -27,8 +27,8 @@ #include "procs.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" const cl_mem_flags flag_set[] = { CL_MEM_ALLOC_HOST_PTR, diff --git a/test_conformance/basic/test_explicit_s2v.cpp b/test_conformance/basic/test_explicit_s2v.cpp index ff154514..1da08968 100644 --- a/test_conformance/basic/test_explicit_s2v.cpp +++ b/test_conformance/basic/test_explicit_s2v.cpp @@ -27,8 +27,8 @@ #include "procs.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" #define DECLARE_S2V_IDENT_KERNEL(srctype,dsttype,size) \ "__kernel void test_conversion(__global " srctype " *sourceValues, __global " dsttype #size " *destValues )\n" \ diff --git a/test_conformance/basic/test_fpmath_float.c b/test_conformance/basic/test_fpmath_float.c index ad76e7c8..0811e72c 100644 --- a/test_conformance/basic/test_fpmath_float.c +++ b/test_conformance/basic/test_fpmath_float.c @@ -24,7 +24,7 @@ #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 77199b8e..7ad883a1 100644 --- a/test_conformance/basic/test_fpmath_float2.c +++ b/test_conformance/basic/test_fpmath_float2.c @@ -24,7 +24,7 @@ #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 c42e77e3..fb45c780 100644 --- a/test_conformance/basic/test_fpmath_float4.c +++ b/test_conformance/basic/test_fpmath_float4.c @@ -27,7 +27,7 @@ #include "procs.h" -#include "../../test_common/harness/rounding_mode.h" +#include "harness/rounding_mode.h" const char *fpadd4_kernel_code = "__kernel void test_fpadd4(__global float4 *srcA, __global float4 *srcB, __global float4 *dst)\n" diff --git a/test_conformance/basic/test_image_param.c b/test_conformance/basic/test_image_param.c index cf89216d..e7c88f47 100644 --- a/test_conformance/basic/test_image_param.c +++ b/test_conformance/basic/test_image_param.c @@ -27,9 +27,9 @@ #include "procs.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/imageHelpers.h" -#include "../../test_common/harness/conversions.h" +#include "harness/typeWrappers.h" +#include "harness/imageHelpers.h" +#include "harness/conversions.h" static const char *param_kernel[] = { diff --git a/test_conformance/basic/test_kernel_memory_alignment.cpp b/test_conformance/basic/test_kernel_memory_alignment.cpp index bd7f1ef6..5e15e3f0 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_vec_type_hint.c b/test_conformance/basic/test_vec_type_hint.c index 7e60b5bb..a95b9aa7 100644 --- a/test_conformance/basic/test_vec_type_hint.c +++ b/test_conformance/basic/test_vec_type_hint.c @@ -25,8 +25,8 @@ #include "procs.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" static const char *sample_kernel = { diff --git a/test_conformance/basic/test_vector_creation.cpp b/test_conformance/basic/test_vector_creation.cpp index 9c01ebf0..052ee4c4 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 f82a9ed5..0bfc8d7b 100644 --- a/test_conformance/basic/test_vloadstore.c +++ b/test_conformance/basic/test_vloadstore.c @@ -33,9 +33,9 @@ #include "procs.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" +#include "harness/errorHelpers.h" // Outputs debug information for stores #define DEBUG 0 diff --git a/test_conformance/basic/test_work_item_functions.cpp b/test_conformance/basic/test_work_item_functions.cpp index c1d5594f..fdb7384a 100644 --- a/test_conformance/basic/test_work_item_functions.cpp +++ b/test_conformance/basic/test_work_item_functions.cpp @@ -27,8 +27,8 @@ #include "procs.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" typedef struct work_item_data { diff --git a/test_conformance/buffers/main.c b/test_conformance/buffers/main.c index 6901c7f2..de8d370e 100644 --- a/test_conformance/buffers/main.c +++ b/test_conformance/buffers/main.c @@ -19,7 +19,7 @@ #include #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" basefn bufferfn_list[] = { test_buffer_read_async_int, diff --git a/test_conformance/buffers/procs.h b/test_conformance/buffers/procs.h index f5baebf5..ab29a8c6 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 b6227d3f..9f3de3bf 100644 --- a/test_conformance/buffers/test_buffer_copy.c +++ b/test_conformance/buffers/test_buffer_copy.c @@ -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 7c751d7a..f370a40e 100644 --- a/test_conformance/buffers/test_buffer_fill.c +++ b/test_conformance/buffers/test_buffer_fill.c @@ -23,7 +23,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 c57de9fe..1e0ef574 100644 --- a/test_conformance/buffers/test_buffer_map.c +++ b/test_conformance/buffers/test_buffer_map.c @@ -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_migrate.c b/test_conformance/buffers/test_buffer_migrate.c index 6488314b..0d247e0c 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_write.c b/test_conformance/buffers/test_buffer_write.c index 4eb1278d..6bf3e75c 100644 --- a/test_conformance/buffers/test_buffer_write.c +++ b/test_conformance/buffers/test_buffer_write.c @@ -23,7 +23,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 5a890a07..b885b194 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/commonfns/main.c b/test_conformance/commonfns/main.c index 8db10f61..c0d3adb0 100644 --- a/test_conformance/commonfns/main.c +++ b/test_conformance/commonfns/main.c @@ -24,7 +24,7 @@ #include #include "procs.h" -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" int g_arrVecSizes[kVectorSizeCount + kStrangeVectorSizeCount]; int g_arrStrangeVectorSizes[kStrangeVectorSizeCount] = {3}; diff --git a/test_conformance/commonfns/procs.h b/test_conformance/commonfns/procs.h index 86c69d54..dcd36814 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_clamp.c b/test_conformance/commonfns/test_clamp.c index 5025067c..dc3380d3 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_minf.c b/test_conformance/commonfns/test_minf.c index 16e2b71d..fb11bf5e 100644 --- a/test_conformance/commonfns/test_minf.c +++ b/test_conformance/commonfns/test_minf.c @@ -26,7 +26,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/compiler/main.c b/test_conformance/compiler/main.c index ad210c3a..fe4b8900 100644 --- a/test_conformance/compiler/main.c +++ b/test_conformance/compiler/main.c @@ -23,7 +23,7 @@ #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 34babc10..81cbdf41 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/test_compile.c b/test_conformance/compiler/test_compile.c index 80a1d98a..dd28aea1 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/computeinfo/main.c b/test_conformance/computeinfo/main.c index 1aa68ec3..a6101427 100644 --- a/test_conformance/computeinfo/main.c +++ b/test_conformance/computeinfo/main.c @@ -17,8 +17,8 @@ #include #include #include -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" typedef struct { diff --git a/test_conformance/contractions/CMakeLists.txt b/test_conformance/contractions/CMakeLists.txt index 5ff06361..25ae5e00 100644 --- a/test_conformance/contractions/CMakeLists.txt +++ b/test_conformance/contractions/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories(../../test_common/harness) - add_executable(conformance_test_contractions contractions.c ../../test_common/harness/mt19937.c diff --git a/test_conformance/contractions/contractions.c b/test_conformance/contractions/contractions.c index 892ea3fd..b0cdf78a 100644 --- a/test_conformance/contractions/contractions.c +++ b/test_conformance/contractions/contractions.c @@ -30,17 +30,17 @@ #include #endif -#include "mingw_compat.h" +#include "harness/mingw_compat.h" #if defined (__MINGW32__) #include #endif #include -#include "errorHelpers.h" -#include "../../test_common/harness/mt19937.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/rounding_mode.h" -#include "../../test_common/harness/fpcontrol.h" +#include "harness/errorHelpers.h" +#include "harness/mt19937.h" +#include "harness/kernelHelpers.h" +#include "harness/rounding_mode.h" +#include "harness/fpcontrol.h" #if defined( __APPLE__ ) #include #endif @@ -51,7 +51,7 @@ #endif #if defined (_WIN32) -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include #endif diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt index 83e78576..47632bfd 100644 --- a/test_conformance/conversions/CMakeLists.txt +++ b/test_conformance/conversions/CMakeLists.txt @@ -7,8 +7,6 @@ set(CMAKE_C_FLAGS_RELEASE "-O0") set(CMAKE_CXX_FLAGS_RELEASE "-O0") endif(MSVC) -include_directories(../../test_common/harness) - add_executable(conformance_test_conversions Sleep.c test_conversions.c basic_test_conversions.c ../../test_common/harness/ThreadPool.c diff --git a/test_conformance/conversions/basic_test_conversions.c b/test_conformance/conversions/basic_test_conversions.c index 33560dc4..be2f67c7 100644 --- a/test_conformance/conversions/basic_test_conversions.c +++ b/test_conformance/conversions/basic_test_conversions.c @@ -20,8 +20,8 @@ #include #include -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/compat.h" +#include "harness/mt19937.h" static inline cl_ulong random64( MTdata d ); diff --git a/test_conformance/conversions/basic_test_conversions.h b/test_conformance/conversions/basic_test_conversions.h index 98ab7674..c58ce59b 100644 --- a/test_conformance/conversions/basic_test_conversions.h +++ b/test_conformance/conversions/basic_test_conversions.h @@ -21,9 +21,9 @@ #include #endif -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/rounding_mode.h" +#include "harness/compat.h" +#include "harness/errorHelpers.h" +#include "harness/rounding_mode.h" #include #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 c9850480..1bf0bc58 100644 --- a/test_conformance/conversions/test_conversions.c +++ b/test_conformance/conversions/test_conversions.c @@ -13,10 +13,10 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/rounding_mode.h" -#include "../../test_common/harness/ThreadPool.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/compat.h" +#include "harness/rounding_mode.h" +#include "harness/ThreadPool.h" +#include "harness/parseParameters.h" #if defined (_WIN32) #define MAX(x,y) ((x>y)?x:y); #define MIN(x,y) ((x #endif -#include "mingw_compat.h" +#include "harness/mingw_compat.h" #if defined(__MINGW32__) #include #endif @@ -66,7 +66,7 @@ #if (defined(_WIN32) && defined (_MSC_VER)) // need for _controlfp_s and rouinding modes in RoundingMode #include -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #endif #pragma mark - diff --git a/test_conformance/d3d10/CMakeLists.txt b/test_conformance/d3d10/CMakeLists.txt index 3949d740..96afde59 100644 --- a/test_conformance/d3d10/CMakeLists.txt +++ b/test_conformance/d3d10/CMakeLists.txt @@ -11,8 +11,7 @@ set(D3D10_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x64) endif(${ARCH} STREQUAL "x86_64") list(APPEND CLConform_INCLUDE_DIR ${D3D10_INCLUDE_DIR}) -include_directories (${CLConform_SOURCE_DIR}/test_common/harness - ${CLConform_INCLUDE_DIR} ) +include_directories (${CLConform_INCLUDE_DIR}) link_directories(${CL_LIB_DIR}, ${D3D10_LIB_DIR}) list(APPEND CLConform_LIBRARIES d3d10 dxgi) diff --git a/test_conformance/d3d11/CMakeLists.txt b/test_conformance/d3d11/CMakeLists.txt index 563fb6be..8e11bd67 100644 --- a/test_conformance/d3d11/CMakeLists.txt +++ b/test_conformance/d3d11/CMakeLists.txt @@ -11,8 +11,7 @@ set(D3D11_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x64) endif(${ARCH} STREQUAL "x86_64") list(APPEND CLConform_INCLUDE_DIR ${D3D11_INCLUDE_DIR}) -include_directories (${CLConform_SOURCE_DIR}/test_common/harness - ${CLConform_INCLUDE_DIR} ) +include_directories (${CLConform_INCLUDE_DIR}) link_directories(${CL_LIB_DIR}, ${D3D11_LIB_DIR}) list(APPEND CLConform_LIBRARIES d3d11 dxgi) diff --git a/test_conformance/device_partition/main.c b/test_conformance/device_partition/main.c index 79de1d47..8f86857d 100644 --- a/test_conformance/device_partition/main.c +++ b/test_conformance/device_partition/main.c @@ -23,8 +23,8 @@ #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 9ba2e00f..1c83045e 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(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/test_device_partition.cpp b/test_conformance/device_partition/test_device_partition.cpp index 46b950f2..ab4af6fa 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" const char *test_kernels[] = { "__kernel void kernelA(__global int *dst)\n" diff --git a/test_conformance/events/main.c b/test_conformance/events/main.c index 58ada02d..7de13388 100644 --- a/test_conformance/events/main.c +++ b/test_conformance/events/main.c @@ -21,7 +21,7 @@ #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 b16e037e..a79d5ea0 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/test_callbacks.cpp b/test_conformance/events/test_callbacks.cpp index ab9896f4..47aa0139 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 ac8a3087..5f0515ba 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_multithreaded.cpp b/test_conformance/events/test_userevents_multithreaded.cpp index ad8fafb5..4ba30c1f 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/geometrics/main.c b/test_conformance/geometrics/main.c index c6741623..3e54c8a3 100644 --- a/test_conformance/geometrics/main.c +++ b/test_conformance/geometrics/main.c @@ -21,7 +21,7 @@ #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 21c4dbc1..86022f5c 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 const unsigned int g_vecSizeof[]; diff --git a/test_conformance/geometrics/test_geometrics.cpp b/test_conformance/geometrics/test_geometrics.cpp index 40770416..d90626ea 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 1bef318a..44d27cd2 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 688ce197..d4668e6a 100644 --- a/test_conformance/gl/main.cpp +++ b/test_conformance/gl/main.cpp @@ -28,8 +28,8 @@ #endif #include "procs.h" -#include "../../test_common/gl/setup.h" -#include "../../test_common/harness/testHarness.h" +#include "gl/setup.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/gl/procs.h b/test_conformance/gl/procs.h index 81293ec6..147de172 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 c69dd38a..99ee9d0f 100644 --- a/test_conformance/gl/testBase.h +++ b/test_conformance/gl/testBase.h @@ -30,20 +30,20 @@ #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/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/threadTesting.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/threadTesting.h" +#include "harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/mt19937.h" -#include "../../test_common/gl/helpers.h" +#include "gl/helpers.h" #include "../images/image_helpers.h" extern const char *get_kernel_suffix( cl_image_format *format ); diff --git a/test_conformance/gl/test_buffers.cpp b/test_conformance/gl/test_buffers.cpp index e109cef3..285d2ea1 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" #include #include diff --git a/test_conformance/gl/test_fence_sync.cpp b/test_conformance/gl/test_fence_sync.cpp index 3ab32c6a..19e93161 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/half/cl_utils.h b/test_conformance/half/cl_utils.h index 8d97d252..38e7c409 100644 --- a/test_conformance/half/cl_utils.h +++ b/test_conformance/half/cl_utils.h @@ -29,8 +29,8 @@ #include #endif -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/errorHelpers.h" +#include "harness/compat.h" +#include "harness/errorHelpers.h" #if defined (_WIN32) #define MAX(x,y) ((x>y)?x:y); diff --git a/test_conformance/half/main.c b/test_conformance/half/main.c index 3d14013b..68ee1f4a 100644 --- a/test_conformance/half/main.c +++ b/test_conformance/half/main.c @@ -24,8 +24,8 @@ #include #endif -#include "../../test_common/harness/mingw_compat.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/mingw_compat.h" +#include "harness/parseParameters.h" #if defined (__MINGW32__) #include #endif diff --git a/test_conformance/images/image_helpers.h b/test_conformance/images/image_helpers.h index 3be5dc8c..bde02b4f 100644 --- a/test_conformance/images/image_helpers.h +++ b/test_conformance/images/image_helpers.h @@ -34,14 +34,14 @@ #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/images/kernel_read_write/main.cpp b/test_conformance/images/kernel_read_write/main.cpp index b9cce9f2..56d9bc5e 100644 --- a/test_conformance/images/kernel_read_write/main.cpp +++ b/test_conformance/images/kernel_read_write/main.cpp @@ -29,7 +29,7 @@ #endif #include "../testBase.h" -#include "../../../test_common/harness/fpcontrol.h" +#include "harness/fpcontrol.h" #if defined(__PPC__) // Global varaiable used to hold the FPU control register state. The FPSCR register can not diff --git a/test_conformance/images/samplerlessReads/main.cpp b/test_conformance/images/samplerlessReads/main.cpp index d1e07e5f..11868702 100644 --- a/test_conformance/images/samplerlessReads/main.cpp +++ b/test_conformance/images/samplerlessReads/main.cpp @@ -29,7 +29,7 @@ #endif #include "../testBase.h" -#include "../../../test_common/harness/fpcontrol.h" +#include "harness/fpcontrol.h" #if defined(__PPC__) // Global varaiable used to hold the FPU control register state. The FPSCR register can not diff --git a/test_conformance/images/testBase.h b/test_conformance/images/testBase.h index f3612fbc..6f6e206c 100644 --- a/test_conformance/images/testBase.h +++ b/test_conformance/images/testBase.h @@ -16,9 +16,9 @@ #ifndef _testBase_h #define _testBase_h -#include "../../test_common/harness/testHarness.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/clImageHelper.h" +#include "harness/testHarness.h" +#include "harness/kernelHelpers.h" +#include "harness/clImageHelper.h" #include "image_helpers.h" diff --git a/test_conformance/integer_ops/main.c b/test_conformance/integer_ops/main.c index 43674f16..8f143b19 100644 --- a/test_conformance/integer_ops/main.c +++ b/test_conformance/integer_ops/main.c @@ -23,7 +23,7 @@ #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 c9c65a10..facbf00f 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/test_int_basic_ops.c b/test_conformance/integer_ops/test_int_basic_ops.c index e77dac76..5682fd42 100644 --- a/test_conformance/integer_ops/test_int_basic_ops.c +++ b/test_conformance/integer_ops/test_int_basic_ops.c @@ -26,8 +26,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 f823ee3a..2d4ed92f 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_unary_ops.cpp b/test_conformance/integer_ops/test_unary_ops.cpp index 779c0861..12f41cb4 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 fd10ee3b..f8b29c0a 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 3c9f0ec3..97be883c 100644 --- a/test_conformance/integer_ops/verification_and_generation_functions.c +++ b/test_conformance/integer_ops/verification_and_generation_functions.c @@ -26,7 +26,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 a7f38d62..044578a3 100644 --- a/test_conformance/math_brute_force/FunctionList.h +++ b/test_conformance/math_brute_force/FunctionList.h @@ -27,8 +27,8 @@ #include #endif -#include "../../test_common/harness/compat.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/compat.h" +#include "harness/mt19937.h" #ifdef __cplusplus extern "C" { diff --git a/test_conformance/math_brute_force/Utility.h b/test_conformance/math_brute_force/Utility.h index 736940ef..d43cd05f 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 #else @@ -27,15 +27,15 @@ #include #endif -#include "../../test_common/harness/rounding_mode.h" -#include "../../test_common/harness/fpcontrol.h" +#include "harness/rounding_mode.h" +#include "harness/fpcontrol.h" #if defined( _WIN32) && defined (_MSC_VER) -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #endif -#include "../../test_common/harness/ThreadPool.h" +#include "harness/ThreadPool.h" #define BUFFER_SIZE (1024*1024*2) #if defined( __GNUC__ ) diff --git a/test_conformance/math_brute_force/reference_math.c b/test_conformance/math_brute_force/reference_math.c index 406ba46d..fcca78ba 100644 --- a/test_conformance/math_brute_force/reference_math.c +++ b/test_conformance/math_brute_force/reference_math.c @@ -14,7 +14,7 @@ // limitations under the License. // -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #include "reference_math.h" #include diff --git a/test_conformance/mem_host_flags/main.cpp b/test_conformance/mem_host_flags/main.cpp index 9277e9bd..d74da528 100644 --- a/test_conformance/mem_host_flags/main.cpp +++ b/test_conformance/mem_host_flags/main.cpp @@ -28,7 +28,7 @@ #endif #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #if !defined(_WIN32) #include diff --git a/test_conformance/mem_host_flags/testBase.h b/test_conformance/mem_host_flags/testBase.h index ea26638a..61f09ff1 100644 --- a/test_conformance/mem_host_flags/testBase.h +++ b/test_conformance/mem_host_flags/testBase.h @@ -34,12 +34,12 @@ //#include #endif -#include "../../test_common/harness/errorHelpers.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/threadTesting.h" -#include "../../test_common/harness/typeWrappers.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/errorHelpers.h" +#include "harness/kernelHelpers.h" +#include "harness/threadTesting.h" +#include "harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/mt19937.h" #include "../images/image_helpers.h" diff --git a/test_conformance/multiple_device_context/main.c b/test_conformance/multiple_device_context/main.c index 7f3fb2cf..963f40cc 100644 --- a/test_conformance/multiple_device_context/main.c +++ b/test_conformance/multiple_device_context/main.c @@ -23,8 +23,8 @@ #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 0141a347..a6c941ee 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_multiple_contexts_same_device(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); extern int test_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/test_multiple_contexts.c b/test_conformance/multiple_device_context/test_multiple_contexts.c index 80c72214..3afd4d2b 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 e205cfd6..6f05650a 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/printf/test_printf.c b/test_conformance/printf/test_printf.c index 71488371..30b7feaa 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" #if !defined(_WIN32) #include #endif @@ -42,11 +42,11 @@ #include #define streamDup(fd1) _dup(fd1) #define streamDup2(fd1,fd2) _dup2(fd1,fd2) -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" #endif -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/mt19937.h" +#include "harness/kernelHelpers.h" +#include "harness/mt19937.h" typedef unsigned int uint32_t; diff --git a/test_conformance/profiling/copy.c b/test_conformance/profiling/copy.c index 57ff4ec1..d6c5914b 100644 --- a/test_conformance/profiling/copy.c +++ b/test_conformance/profiling/copy.c @@ -26,9 +26,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 2ec451c9..908f5ebe 100644 --- a/test_conformance/profiling/execute.c +++ b/test_conformance/profiling/execute.c @@ -27,8 +27,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 d407644d..8e456024 100644 --- a/test_conformance/profiling/execute_multipass.c +++ b/test_conformance/profiling/execute_multipass.c @@ -27,8 +27,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 7a9a710c..4dff5b19 100644 --- a/test_conformance/profiling/main.c +++ b/test_conformance/profiling/main.c @@ -23,7 +23,7 @@ #include #include #include "procs.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" basefn basefn_list[] = { read_int_array, diff --git a/test_conformance/profiling/procs.h b/test_conformance/profiling/procs.h index 42a64dae..9f3d10af 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 1188f7b0..062fc932 100644 --- a/test_conformance/profiling/readArray.c +++ b/test_conformance/profiling/readArray.c @@ -27,7 +27,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 03deb4db..99279fc4 100644 --- a/test_conformance/profiling/readImage.c +++ b/test_conformance/profiling/readImage.c @@ -26,8 +26,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 af693cde..4b1c65c2 100644 --- a/test_conformance/profiling/writeArray.c +++ b/test_conformance/profiling/writeArray.c @@ -27,9 +27,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 c6fd4995..c17072ec 100644 --- a/test_conformance/profiling/writeImage.c +++ b/test_conformance/profiling/writeImage.c @@ -27,8 +27,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 3127d4d0..4c4ed588 100644 --- a/test_conformance/relationals/main.c +++ b/test_conformance/relationals/main.c @@ -23,7 +23,7 @@ #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 95cc1833..b26326ac 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/test_comparisons_double.cpp b/test_conformance/relationals/test_comparisons_double.cpp index 5c1007de..066008c6 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" #include #include diff --git a/test_conformance/relationals/test_comparisons_float.cpp b/test_conformance/relationals/test_comparisons_float.cpp index 18090059..a36e5006 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" #include #include diff --git a/test_conformance/relationals/test_relationals.cpp b/test_conformance/relationals/test_relationals.cpp index 9bfa22c9..505d4645 100644 --- a/test_conformance/relationals/test_relationals.cpp +++ b/test_conformance/relationals/test_relationals.cpp @@ -14,8 +14,8 @@ // limitations under the License. // #include "testBase.h" -#include "../../test_common/harness/conversions.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/conversions.h" +#include "harness/typeWrappers.h" #include #include diff --git a/test_conformance/relationals/test_shuffles.cpp b/test_conformance/relationals/test_shuffles.cpp index bd272aa8..4bf2cbf5 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" #include #include diff --git a/test_conformance/select/test_select.c b/test_conformance/select/test_select.c index c8adebed..e3a12bdb 100644 --- a/test_conformance/select/test_select.c +++ b/test_conformance/select/test_select.c @@ -34,11 +34,11 @@ #include #include "test_select.h" -#include "../../test_common/harness/testHarness.h" +#include "harness/testHarness.h" -#include "../../test_common/harness/kernelHelpers.h" -#include "../../test_common/harness/mt19937.h" -#include "../../test_common/harness/parseParameters.h" +#include "harness/kernelHelpers.h" +#include "harness/mt19937.h" +#include "harness/parseParameters.h" //----------------------------------------- // Static functions diff --git a/test_conformance/select/test_select.h b/test_conformance/select/test_select.h index fe645072..f56a0f95 100644 --- a/test_conformance/select/test_select.h +++ b/test_conformance/select/test_select.h @@ -32,7 +32,7 @@ #include #endif -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" // Enable the test to be used with ATF #if USE_ATF 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 d5859b6f..c92c53f9 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 91329de1..01187a96 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/thread_dimensions/main.c b/test_conformance/thread_dimensions/main.c index 43ffb6ef..3f125a68 100644 --- a/test_conformance/thread_dimensions/main.c +++ b/test_conformance/thread_dimensions/main.c @@ -24,7 +24,7 @@ #include #include "procs.h" -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" basefn basefn_list[] = { test_quick_thread_dimensions_1d_explicit_local, diff --git a/test_conformance/thread_dimensions/procs.h b/test_conformance/thread_dimensions/procs.h index 07c3f954..47e2df37 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 7bffdbfa..058a4756 100644 --- a/test_conformance/thread_dimensions/test_thread_dimensions.c +++ b/test_conformance/thread_dimensions/test_thread_dimensions.c @@ -27,7 +27,7 @@ #include "procs.h" -#include "../../test_common/harness/compat.h" +#include "harness/compat.h" #define ITERATIONS 4 #define DEBUG 0 diff --git a/test_conformance/vec_align/defines.h b/test_conformance/vec_align/defines.h index 012654b8..93f2fe42 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 0a2b4392..2da53cfe 100644 --- a/test_conformance/vec_align/main.c +++ b/test_conformance/vec_align/main.c @@ -23,7 +23,7 @@ #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 c963244d..4c5a3fe9 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 600cb163..bcd98f61 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" #include #include diff --git a/test_conformance/vec_align/test_vec_align.c b/test_conformance/vec_align/test_vec_align.c index bdde21a4..5820fd3a 100644 --- a/test_conformance/vec_align/test_vec_align.c +++ b/test_conformance/vec_align/test_vec_align.c @@ -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" #include #include diff --git a/test_conformance/vec_step/defines.h b/test_conformance/vec_step/defines.h index c2f8c9df..9f8ceab6 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 51f9f4fa..35a7ed0b 100644 --- a/test_conformance/vec_step/main.c +++ b/test_conformance/vec_step/main.c @@ -23,7 +23,7 @@ #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 884bc18e..2c6e215f 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 8a5bb2c5..1184cecc 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" #include #include diff --git a/test_conformance/vec_step/test_step.c b/test_conformance/vec_step/test_step.c index a1e1843f..1d42d01f 100644 --- a/test_conformance/vec_step/test_step.c +++ b/test_conformance/vec_step/test_step.c @@ -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" #include #include diff --git a/test_extensions/media_sharing/main.cpp b/test_extensions/media_sharing/main.cpp index 82d572b2..45e604fc 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" extern int test_context_create(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements); diff --git a/test_extensions/media_sharing/test_functions_kernel.cpp b/test_extensions/media_sharing/test_functions_kernel.cpp index 0476b4f8..8ede1a59 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 17fdea1d..50ff60bd 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 6c387242..cd49009f 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 1f011a59..e888e4ed 100644 --- a/test_extensions/media_sharing/utils.h +++ b/test_extensions/media_sharing/utils.h @@ -19,7 +19,7 @@ #include "wrappers.h" #include "CL/cl_dx9_media_sharing.h" -#include "../../test_common/harness/typeWrappers.h" +#include "harness/typeWrappers.h" #include #include diff --git a/test_extensions/media_sharing/wrappers.cpp b/test_extensions/media_sharing/wrappers.cpp index a7baa8a0..d660502c 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" const char* CDeviceWrapper::WINDOW_TITLE = "cl_khr_dx9_media_sharing"; const int CDeviceWrapper::WINDOW_WIDTH = 256;