diff --git a/CMakeLists.txt b/CMakeLists.txt index e70b91f4..5831756c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,6 +170,7 @@ elseif (CMAKE_BUILD_TYPE STREQUAL "debug") endif(CMAKE_BUILD_TYPE STREQUAL "release") +add_subdirectory(test_common) add_subdirectory(test_conformance) set (PY_PATH "${CLConform_SOURCE_DIR}/test_conformance/*.py") diff --git a/test_common/CMakeLists.txt b/test_common/CMakeLists.txt new file mode 100644 index 00000000..f630cacd --- /dev/null +++ b/test_common/CMakeLists.txt @@ -0,0 +1,32 @@ + +set(HARNESS_COMMON_SOURCES + harness/threadTesting.c + harness/typeWrappers.cpp + harness/mt19937.c + harness/conversions.c + harness/rounding_mode.c + harness/msvc9.c +) + +set_source_files_properties(${HARNESS_COMMON_SOURCES} PROPERTIES LANGUAGE CXX) + +add_library(harness-common STATIC ${HARNESS_COMMON_SOURCES}) + +set(HARNESS_SOURCES + harness/crc32.c + harness/errorHelpers.c + harness/genericThread.cpp + harness/imageHelpers.cpp + harness/kernelHelpers.c + harness/os_helpers.cpp + harness/parseParameters.cpp + harness/testHarness.c + harness/ThreadPool.c + miniz/miniz.c +) + +set_source_files_properties(${HARNESS_SOURCES} PROPERTIES LANGUAGE CXX) + +add_library(harness STATIC ${HARNESS_SOURCES}) + +target_link_libraries(harness harness-common) diff --git a/test_conformance/CMakeCommon.txt b/test_conformance/CMakeCommon.txt index 62c339d7..ef445f20 100644 --- a/test_conformance/CMakeCommon.txt +++ b/test_conformance/CMakeCommon.txt @@ -10,4 +10,4 @@ set_source_files_properties(${${MODULE_NAME}_SOURCES} PROPERTIES LANGUAGE CXX) set_property(TARGET ${${MODULE_NAME}_OUT} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}") -TARGET_LINK_LIBRARIES(${${MODULE_NAME}_OUT} ${CLConform_LIBRARIES}) +TARGET_LINK_LIBRARIES(${${MODULE_NAME}_OUT} ${HARNESS_LIB} ${CLConform_LIBRARIES}) diff --git a/test_conformance/CMakeLists.txt b/test_conformance/CMakeLists.txt index 156a8a28..e488b705 100644 --- a/test_conformance/CMakeLists.txt +++ b/test_conformance/CMakeLists.txt @@ -1,6 +1,8 @@ # Remember current source directory (`test_conformance'). set( CLConf_Install_Base_Dir "${CMAKE_CURRENT_SOURCE_DIR}" ) +set(HARNESS_LIB harness) + add_subdirectory( allocations ) add_subdirectory( api ) add_subdirectory( atomics ) diff --git a/test_conformance/SVM/CMakeLists.txt b/test_conformance/SVM/CMakeLists.txt index 4077c417..c56cc57a 100644 --- a/test_conformance/SVM/CMakeLists.txt +++ b/test_conformance/SVM/CMakeLists.txt @@ -16,13 +16,6 @@ set(${MODULE_NAME}_SOURCES test_shared_address_space_fine_grain_buffers.cpp test_shared_sub_buffers.cpp test_migrate.cpp - ../../test_common/harness/testHarness.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/allocations/CMakeLists.txt b/test_conformance/allocations/CMakeLists.txt index 07da26b0..a4043806 100644 --- a/test_conformance/allocations/CMakeLists.txt +++ b/test_conformance/allocations/CMakeLists.txt @@ -6,15 +6,6 @@ set(${MODULE_NAME}_SOURCES allocation_fill.cpp allocation_functions.cpp allocation_utils.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/api/CMakeLists.txt b/test_conformance/api/CMakeLists.txt index 69f94cab..771f7061 100644 --- a/test_conformance/api/CMakeLists.txt +++ b/test_conformance/api/CMakeLists.txt @@ -24,17 +24,6 @@ set(${MODULE_NAME}_SOURCES test_sub_group_dispatch.cpp test_clone_kernel.cpp test_zero_sized_enqueue.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/conversions.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/imageHelpers.cpp - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/atomics/CMakeLists.txt b/test_conformance/atomics/CMakeLists.txt index 5d9e8827..7d810c96 100644 --- a/test_conformance/atomics/CMakeLists.txt +++ b/test_conformance/atomics/CMakeLists.txt @@ -4,15 +4,6 @@ set(${MODULE_NAME}_SOURCES main.c test_atomics.cpp test_indexed_cases.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/basic/CMakeLists.txt b/test_conformance/basic/CMakeLists.txt index e390bb9b..ba7a7dfd 100644 --- a/test_conformance/basic/CMakeLists.txt +++ b/test_conformance/basic/CMakeLists.txt @@ -58,23 +58,11 @@ set(${MODULE_NAME}_SOURCES test_simple_image_pitch.c test_get_linear_ids.cpp test_rw_image_access_qualifier.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/imageHelpers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/rounding_mode.c - ../../test_common/harness/msvc9.c test_wg_barrier.c test_enqueued_local_size.c test_global_linear_id.c test_local_linear_id.c test_progvar.cpp - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) if(APPLE) diff --git a/test_conformance/buffers/CMakeLists.txt b/test_conformance/buffers/CMakeLists.txt index 8e699e67..329c63b6 100644 --- a/test_conformance/buffers/CMakeLists.txt +++ b/test_conformance/buffers/CMakeLists.txt @@ -12,16 +12,6 @@ set(${MODULE_NAME}_SOURCES test_buffer_fill.c test_buffer_migrate.c test_image_migrate.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/c11_atomics/CMakeLists.txt b/test_conformance/c11_atomics/CMakeLists.txt index e0b77ef5..621adda7 100644 --- a/test_conformance/c11_atomics/CMakeLists.txt +++ b/test_conformance/c11_atomics/CMakeLists.txt @@ -5,14 +5,6 @@ set(${MODULE_NAME}_SOURCES host_atomics.cpp main.cpp test_atomics.cpp - ../../test_common/harness/ThreadPool.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/clcpp/address_spaces/CMakeLists.txt b/test_conformance/clcpp/address_spaces/CMakeLists.txt index 7410b8fb..2b6369f6 100644 --- a/test_conformance/clcpp/address_spaces/CMakeLists.txt +++ b/test_conformance/clcpp/address_spaces/CMakeLists.txt @@ -2,13 +2,6 @@ set(MODULE_NAME CPP_ADDRESS_SPACES) set(${MODULE_NAME}_SOURCES main.cpp - - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/api/CMakeLists.txt b/test_conformance/clcpp/api/CMakeLists.txt index ac3e7dbb..30763d6f 100644 --- a/test_conformance/clcpp/api/CMakeLists.txt +++ b/test_conformance/clcpp/api/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_API) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/atomics/CMakeLists.txt b/test_conformance/clcpp/atomics/CMakeLists.txt index 1ff163e3..4fb4bfd1 100644 --- a/test_conformance/clcpp/atomics/CMakeLists.txt +++ b/test_conformance/clcpp/atomics/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_ATOMICS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/attributes/CMakeLists.txt b/test_conformance/clcpp/attributes/CMakeLists.txt index e9e6539d..1b1c15aa 100644 --- a/test_conformance/clcpp/attributes/CMakeLists.txt +++ b/test_conformance/clcpp/attributes/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_ATTRIBUTES) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/common_funcs/CMakeLists.txt b/test_conformance/clcpp/common_funcs/CMakeLists.txt index 8ec9b077..5e4d8b03 100644 --- a/test_conformance/clcpp/common_funcs/CMakeLists.txt +++ b/test_conformance/clcpp/common_funcs/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_COMMON_FUNCS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/convert/CMakeLists.txt b/test_conformance/clcpp/convert/CMakeLists.txt index 1f871c05..9f69feab 100644 --- a/test_conformance/clcpp/convert/CMakeLists.txt +++ b/test_conformance/clcpp/convert/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_CONVERT) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/device_queue/CMakeLists.txt b/test_conformance/clcpp/device_queue/CMakeLists.txt index c9dcf91b..0e1b2ee4 100644 --- a/test_conformance/clcpp/device_queue/CMakeLists.txt +++ b/test_conformance/clcpp/device_queue/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_DEVICE_QUEUE) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/geometric_funcs/CMakeLists.txt b/test_conformance/clcpp/geometric_funcs/CMakeLists.txt index 917e56dd..25d05ed1 100644 --- a/test_conformance/clcpp/geometric_funcs/CMakeLists.txt +++ b/test_conformance/clcpp/geometric_funcs/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_GEOMETRIC_FUNCS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/images/CMakeLists.txt b/test_conformance/clcpp/images/CMakeLists.txt index 51e45c16..3c92ecd7 100644 --- a/test_conformance/clcpp/images/CMakeLists.txt +++ b/test_conformance/clcpp/images/CMakeLists.txt @@ -2,15 +2,6 @@ set(MODULE_NAME CPP_IMAGES) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/mt19937.c - ../../../test_common/harness/conversions.c - ../../../test_common/harness/imageHelpers.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/integer_funcs/CMakeLists.txt b/test_conformance/clcpp/integer_funcs/CMakeLists.txt index 14a2517c..ba4cfe86 100644 --- a/test_conformance/clcpp/integer_funcs/CMakeLists.txt +++ b/test_conformance/clcpp/integer_funcs/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_INTEGER_FUNCS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/math_funcs/CMakeLists.txt b/test_conformance/clcpp/math_funcs/CMakeLists.txt index 1cd05c6f..c3b56c17 100644 --- a/test_conformance/clcpp/math_funcs/CMakeLists.txt +++ b/test_conformance/clcpp/math_funcs/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_MATH_FUNCS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/pipes/CMakeLists.txt b/test_conformance/clcpp/pipes/CMakeLists.txt index 57b6bf87..65daae97 100644 --- a/test_conformance/clcpp/pipes/CMakeLists.txt +++ b/test_conformance/clcpp/pipes/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_PIPES) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/program_scope_ctors_dtors/CMakeLists.txt b/test_conformance/clcpp/program_scope_ctors_dtors/CMakeLists.txt index 9ea82c5e..fd36d300 100644 --- a/test_conformance/clcpp/program_scope_ctors_dtors/CMakeLists.txt +++ b/test_conformance/clcpp/program_scope_ctors_dtors/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_PROGRAM_SCOPE_CTORS_DTORS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/reinterpret/CMakeLists.txt b/test_conformance/clcpp/reinterpret/CMakeLists.txt index d893921e..ed02c56f 100644 --- a/test_conformance/clcpp/reinterpret/CMakeLists.txt +++ b/test_conformance/clcpp/reinterpret/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_REINTERPRET) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/relational_funcs/CMakeLists.txt b/test_conformance/clcpp/relational_funcs/CMakeLists.txt index 8e1acc02..3a8389cb 100644 --- a/test_conformance/clcpp/relational_funcs/CMakeLists.txt +++ b/test_conformance/clcpp/relational_funcs/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_RELATIONAL_FUNCS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/spec_constants/CMakeLists.txt b/test_conformance/clcpp/spec_constants/CMakeLists.txt index 9a2d6dfd..3488a5a7 100644 --- a/test_conformance/clcpp/spec_constants/CMakeLists.txt +++ b/test_conformance/clcpp/spec_constants/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_SPEC_CONSTANTS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/subgroups/CMakeLists.txt b/test_conformance/clcpp/subgroups/CMakeLists.txt index 386bce9a..c8307d26 100644 --- a/test_conformance/clcpp/subgroups/CMakeLists.txt +++ b/test_conformance/clcpp/subgroups/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_SUBGROUPS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/synchronization/CMakeLists.txt b/test_conformance/clcpp/synchronization/CMakeLists.txt index 503392fe..70d3637c 100644 --- a/test_conformance/clcpp/synchronization/CMakeLists.txt +++ b/test_conformance/clcpp/synchronization/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_SYNCHRONIZATION) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/vload_vstore/CMakeLists.txt b/test_conformance/clcpp/vload_vstore/CMakeLists.txt index 6a9db9e8..c66cb6f7 100644 --- a/test_conformance/clcpp/vload_vstore/CMakeLists.txt +++ b/test_conformance/clcpp/vload_vstore/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_VLOAD_VSTORE_FUNCS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/workgroups/CMakeLists.txt b/test_conformance/clcpp/workgroups/CMakeLists.txt index 87011be1..812e982e 100644 --- a/test_conformance/clcpp/workgroups/CMakeLists.txt +++ b/test_conformance/clcpp/workgroups/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_WORKGROUPS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/clcpp/workitems/CMakeLists.txt b/test_conformance/clcpp/workitems/CMakeLists.txt index 37facc54..00359334 100644 --- a/test_conformance/clcpp/workitems/CMakeLists.txt +++ b/test_conformance/clcpp/workitems/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME CPP_WORKITEMS) set(${MODULE_NAME}_SOURCES main.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/commonfns/CMakeLists.txt b/test_conformance/commonfns/CMakeLists.txt index 50aef6c5..9fa76be2 100644 --- a/test_conformance/commonfns/CMakeLists.txt +++ b/test_conformance/commonfns/CMakeLists.txt @@ -20,15 +20,6 @@ set(${MODULE_NAME}_SOURCES test_fmaxf.c test_fminf.c test_binary_fn.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/compatibility/CMakeLists.txt b/test_conformance/compatibility/CMakeLists.txt index fd375068..ad621bfa 100644 --- a/test_conformance/compatibility/CMakeLists.txt +++ b/test_conformance/compatibility/CMakeLists.txt @@ -1 +1,2 @@ +add_subdirectory(test_common) add_subdirectory(test_conformance) diff --git a/test_conformance/compatibility/test_common/CMakeLists.txt b/test_conformance/compatibility/test_common/CMakeLists.txt new file mode 100644 index 00000000..0a3f5ded --- /dev/null +++ b/test_conformance/compatibility/test_common/CMakeLists.txt @@ -0,0 +1,14 @@ + +set(HARNESS_COMPAT_SOURCES + harness/errorHelpers.c + harness/imageHelpers.cpp + harness/kernelHelpers.c + harness/testHarness.c +) + +set_source_files_properties(${HARNESS_COMPAT_SOURCES} PROPERTIES LANGUAGE CXX) + +add_library(harness-compat STATIC ${HARNESS_COMPAT_SOURCES}) + +target_link_libraries(harness-compat harness-common) + diff --git a/test_conformance/compatibility/test_conformance/CMakeLists.txt b/test_conformance/compatibility/test_conformance/CMakeLists.txt index 84858574..ed065822 100644 --- a/test_conformance/compatibility/test_conformance/CMakeLists.txt +++ b/test_conformance/compatibility/test_conformance/CMakeLists.txt @@ -1,2 +1,5 @@ + +set(HARNESS_LIB harness-compat) + add_subdirectory(api) add_subdirectory(basic) diff --git a/test_conformance/compatibility/test_conformance/api/CMakeLists.txt b/test_conformance/compatibility/test_conformance/api/CMakeLists.txt index 76e43689..35b53b9d 100644 --- a/test_conformance/compatibility/test_conformance/api/CMakeLists.txt +++ b/test_conformance/compatibility/test_conformance/api/CMakeLists.txt @@ -21,15 +21,8 @@ set(${MODULE_NAME}_SOURCES test_null_buffer_arg.c test_kernel_arg_info.c test_queue_properties.cpp - ../../test_common/harness/errorHelpers.c - ../../../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../../../test_common/harness/typeWrappers.cpp - ../../../../test_common/harness/conversions.c - ../../../../test_common/harness/mt19937.c - ../../../../test_common/harness/msvc9.c - ../../test_common/harness/imageHelpers.cpp ) +set(${MODULE_NAME}_LIBS harness-compat) + include(../../../CMakeCommon.txt) diff --git a/test_conformance/compatibility/test_conformance/basic/CMakeLists.txt b/test_conformance/compatibility/test_conformance/basic/CMakeLists.txt index 3cbe0941..b92eec4c 100644 --- a/test_conformance/compatibility/test_conformance/basic/CMakeLists.txt +++ b/test_conformance/compatibility/test_conformance/basic/CMakeLists.txt @@ -50,16 +50,8 @@ set(${MODULE_NAME}_SOURCES test_global_work_offsets.cpp test_kernel_call_kernel_function.cpp test_local_kernel_scope.cpp - ../../test_common/harness/errorHelpers.c - ../../../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/imageHelpers.cpp - ../../../../test_common/harness/mt19937.c - ../../../../test_common/harness/conversions.c - ../../../../test_common/harness/rounding_mode.c - ../../../../test_common/harness/msvc9.c ) +set(${MODULE_NAME}_LIBS harness-compat) + include(../../../CMakeCommon.txt) diff --git a/test_conformance/compiler/CMakeLists.txt b/test_conformance/compiler/CMakeLists.txt index 422c5c5c..1e991aa4 100644 --- a/test_conformance/compiler/CMakeLists.txt +++ b/test_conformance/compiler/CMakeLists.txt @@ -10,17 +10,6 @@ set(${MODULE_NAME}_SOURCES test_image_macro.c test_compiler_defines_for_extensions.cpp test_pragma_unroll.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/os_helpers.cpp - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/computeinfo/CMakeLists.txt b/test_conformance/computeinfo/CMakeLists.txt index 266ab6d6..0dfd061a 100644 --- a/test_conformance/computeinfo/CMakeLists.txt +++ b/test_conformance/computeinfo/CMakeLists.txt @@ -2,12 +2,6 @@ set(MODULE_NAME computeinfo) set(${MODULE_NAME}_SOURCES main.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/testHarness.c - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/contractions/CMakeLists.txt b/test_conformance/contractions/CMakeLists.txt index 5c7d86f7..927c035d 100644 --- a/test_conformance/contractions/CMakeLists.txt +++ b/test_conformance/contractions/CMakeLists.txt @@ -2,15 +2,6 @@ set(MODULE_NAME CONTRACTIONS) set(${MODULE_NAME}_SOURCES contractions.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/mingw_compat.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/rounding_mode.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt index 0e90a1a9..ac24d45a 100644 --- a/test_conformance/conversions/CMakeLists.txt +++ b/test_conformance/conversions/CMakeLists.txt @@ -11,16 +11,6 @@ endif(MSVC) set (${MODULE_NAME}_SOURCES Sleep.c test_conversions.c basic_test_conversions.c - ../../test_common/harness/ThreadPool.c - ../../test_common/harness/rounding_mode.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/mingw_compat.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/crc32.c ) if(ANDROID) diff --git a/test_conformance/d3d10/CMakeLists.txt b/test_conformance/d3d10/CMakeLists.txt index 2b1a0761..42751f61 100644 --- a/test_conformance/d3d10/CMakeLists.txt +++ b/test_conformance/d3d10/CMakeLists.txt @@ -25,15 +25,6 @@ set(D3D10_SOURCES misc.cpp main.cpp harness.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) add_executable(conformance_test_d3d10 @@ -43,7 +34,7 @@ set_source_files_properties( ${D3D10_SOURCES} PROPERTIES LANGUAGE CXX) -TARGET_LINK_LIBRARIES(conformance_test_d3d10 +TARGET_LINK_LIBRARIES(conformance_test_d3d10 harness ${CLConform_LIBRARIES}) endif(WIN32) diff --git a/test_conformance/d3d11/CMakeLists.txt b/test_conformance/d3d11/CMakeLists.txt index e6673dd4..d4ffcf47 100644 --- a/test_conformance/d3d11/CMakeLists.txt +++ b/test_conformance/d3d11/CMakeLists.txt @@ -25,15 +25,6 @@ set(D3D11_SOURCES misc.cpp main.cpp harness.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) add_executable(conformance_test_d3d11 @@ -43,7 +34,7 @@ set_source_files_properties( ${D3D11_SOURCES} PROPERTIES LANGUAGE CXX) -TARGET_LINK_LIBRARIES(conformance_test_d3d11 +TARGET_LINK_LIBRARIES(conformance_test_d3d11 harness ${CLConform_LIBRARIES}) endif(WIN32) diff --git a/test_conformance/device_execution/CMakeLists.txt b/test_conformance/device_execution/CMakeLists.txt index 9ba35ca6..fe7a7d03 100644 --- a/test_conformance/device_execution/CMakeLists.txt +++ b/test_conformance/device_execution/CMakeLists.txt @@ -14,13 +14,6 @@ set(DEVICE_EXECUTION_SOURCES main.c nested_blocks.cpp utils.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/device_partition/CMakeLists.txt b/test_conformance/device_partition/CMakeLists.txt index cb8f0c9f..32952d4d 100644 --- a/test_conformance/device_partition/CMakeLists.txt +++ b/test_conformance/device_partition/CMakeLists.txt @@ -3,16 +3,5 @@ set(MODULE_NAME DEVICE_PARTITION) set(${MODULE_NAME}_SOURCES main.c test_device_partition.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/genericThread.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/device_timer/CMakeLists.txt b/test_conformance/device_timer/CMakeLists.txt index a0b24288..ab6fbef0 100644 --- a/test_conformance/device_timer/CMakeLists.txt +++ b/test_conformance/device_timer/CMakeLists.txt @@ -3,12 +3,6 @@ set(MODULE_NAME DEVICE_TIMER) set(${MODULE_NAME}_SOURCES main.c test_device_timer.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/msvc9.c - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/events/CMakeLists.txt b/test_conformance/events/CMakeLists.txt index 7cfb995a..e11055c5 100644 --- a/test_conformance/events/CMakeLists.txt +++ b/test_conformance/events/CMakeLists.txt @@ -9,18 +9,6 @@ set(${MODULE_NAME}_SOURCES test_userevents_multithreaded.cpp action_classes.cpp test_callbacks.cpp - ../../test_common/harness/genericThread.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/ThreadPool.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/generic_address_space/CMakeLists.txt b/test_conformance/generic_address_space/CMakeLists.txt index 0e507359..e74bcf4a 100644 --- a/test_conformance/generic_address_space/CMakeLists.txt +++ b/test_conformance/generic_address_space/CMakeLists.txt @@ -5,13 +5,6 @@ set(${MODULE_NAME}_SOURCES basic_tests.cpp main.cpp stress_tests.cpp - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/geometrics/CMakeLists.txt b/test_conformance/geometrics/CMakeLists.txt index b7fef328..30a6c8ea 100644 --- a/test_conformance/geometrics/CMakeLists.txt +++ b/test_conformance/geometrics/CMakeLists.txt @@ -4,15 +4,6 @@ set(${MODULE_NAME}_SOURCES main.c test_geometrics_double.cpp test_geometrics.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) # VS2005 optimization WAR for geom_length) diff --git a/test_conformance/gl/CMakeLists.txt b/test_conformance/gl/CMakeLists.txt index c2da9167..c427bb00 100644 --- a/test_conformance/gl/CMakeLists.txt +++ b/test_conformance/gl/CMakeLists.txt @@ -23,17 +23,6 @@ set (GL_SOURCES test_fence_sync.cpp helpers.cpp ../../test_common/gl/helpers.cpp - ../../test_common/harness/genericThread.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c - ../../test_common/harness/imageHelpers.cpp ) if (WIN32) @@ -74,5 +63,5 @@ set_source_files_properties( target_include_directories(conformance_test_gl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(conformance_test_gl +TARGET_LINK_LIBRARIES(conformance_test_gl harness ${CLConform_LIBRARIES}) diff --git a/test_conformance/gles/CMakeLists.txt b/test_conformance/gles/CMakeLists.txt index c5294e82..f3674903 100644 --- a/test_conformance/gles/CMakeLists.txt +++ b/test_conformance/gles/CMakeLists.txt @@ -13,16 +13,6 @@ set (${MODULE_NAME}_SOURCES helpers.cpp setup_egl.cpp ../../test_common/gles/helpers.cpp - ../../test_common/harness/genericThread.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) if(ANDROID) diff --git a/test_conformance/half/CMakeLists.txt b/test_conformance/half/CMakeLists.txt index 4b151270..cf8894f4 100644 --- a/test_conformance/half/CMakeLists.txt +++ b/test_conformance/half/CMakeLists.txt @@ -5,14 +5,6 @@ set(${MODULE_NAME}_SOURCES Test_vLoadHalf.c Test_roundTrip.c Test_vStoreHalf.c main.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/mingw_compat.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/ThreadPool.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/testHarness.c - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/headers/CMakeLists.txt b/test_conformance/headers/CMakeLists.txt index 46705e6b..a8d0feb2 100644 --- a/test_conformance/headers/CMakeLists.txt +++ b/test_conformance/headers/CMakeLists.txt @@ -1,11 +1,5 @@ set(HEADERS_SOURCES test_headers.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) set_source_files_properties(${HEADERS_SOURCES} PROPERTIES LANGUAGE CXX) @@ -19,7 +13,7 @@ add_executable( set_property(TARGET ${HEADERS_OUT} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}") -TARGET_LINK_LIBRARIES(${HEADERS_OUT} ${CLConform_LIBRARIES}) +TARGET_LINK_LIBRARIES(${HEADERS_OUT} harness ${CLConform_LIBRARIES}) ######################################################################################## @@ -38,7 +32,7 @@ add_executable( set_property(TARGET ${CL_H_OUT} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}") -TARGET_LINK_LIBRARIES(${CL_H_OUT} ${CLConform_LIBRARIES}) +TARGET_LINK_LIBRARIES(${CL_H_OUT} harness ${CLConform_LIBRARIES}) ######################################################################################## @@ -57,7 +51,7 @@ add_executable( set_property(TARGET ${CL_PLATFORM_H_OUT} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}") -TARGET_LINK_LIBRARIES(${CL_PLATFORM_H_OUT} ${CLConform_LIBRARIES}) +TARGET_LINK_LIBRARIES(${CL_PLATFORM_H_OUT} harness ${CLConform_LIBRARIES}) ######################################################################################## @@ -76,7 +70,7 @@ add_executable( set_property(TARGET ${CL_GL_H_OUT} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}") -TARGET_LINK_LIBRARIES(${CL_GL_H_OUT} ${CLConform_LIBRARIES}) +TARGET_LINK_LIBRARIES(${CL_GL_H_OUT} harness ${CLConform_LIBRARIES}) ######################################################################################## @@ -95,7 +89,7 @@ add_executable( set_property(TARGET ${OPENCL_H_OUT} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}") -TARGET_LINK_LIBRARIES(${OPENCL_H_OUT} ${CLConform_LIBRARIES}) +TARGET_LINK_LIBRARIES(${OPENCL_H_OUT} harness ${CLConform_LIBRARIES}) ######################################################################################## diff --git a/test_conformance/images/clCopyImage/CMakeLists.txt b/test_conformance/images/clCopyImage/CMakeLists.txt index b876fdc7..3e11bd4d 100644 --- a/test_conformance/images/clCopyImage/CMakeLists.txt +++ b/test_conformance/images/clCopyImage/CMakeLists.txt @@ -12,17 +12,6 @@ set(${MODULE_NAME}_SOURCES test_copy_3D_2D_array.cpp test_copy_generic.cpp test_loops.cpp - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/threadTesting.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/imageHelpers.cpp - ../../../test_common/harness/mt19937.c - ../../../test_common/harness/conversions.c - ../../../test_common/harness/typeWrappers.cpp - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/clFillImage/CMakeLists.txt b/test_conformance/images/clFillImage/CMakeLists.txt index 274de2d7..75fca60e 100644 --- a/test_conformance/images/clFillImage/CMakeLists.txt +++ b/test_conformance/images/clFillImage/CMakeLists.txt @@ -11,17 +11,6 @@ set(${MODULE_NAME}_SOURCES test_loops.cpp test_fill_3D.cpp # test_fill_2D_3D.cpp - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/threadTesting.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/imageHelpers.cpp - ../../../test_common/harness/mt19937.c - ../../../test_common/harness/conversions.c - ../../../test_common/harness/typeWrappers.cpp - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) diff --git a/test_conformance/images/clGetInfo/CMakeLists.txt b/test_conformance/images/clGetInfo/CMakeLists.txt index 7722f788..c14951e0 100644 --- a/test_conformance/images/clGetInfo/CMakeLists.txt +++ b/test_conformance/images/clGetInfo/CMakeLists.txt @@ -7,17 +7,6 @@ set(${MODULE_NAME}_SOURCES test_2D.cpp test_loops.cpp test_3D.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/threadTesting.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/imageHelpers.cpp - ../../../test_common/harness/mt19937.c - ../../../test_common/harness/conversions.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/typeWrappers.cpp - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/clReadWriteImage/CMakeLists.txt b/test_conformance/images/clReadWriteImage/CMakeLists.txt index 557d94df..6dd6ed75 100644 --- a/test_conformance/images/clReadWriteImage/CMakeLists.txt +++ b/test_conformance/images/clReadWriteImage/CMakeLists.txt @@ -8,17 +8,6 @@ set(${MODULE_NAME}_SOURCES test_read_2D_array.cpp test_loops.cpp test_read_3D.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/threadTesting.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/imageHelpers.cpp - ../../../test_common/harness/mt19937.c - ../../../test_common/harness/conversions.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/typeWrappers.cpp - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/kernel_image_methods/CMakeLists.txt b/test_conformance/images/kernel_image_methods/CMakeLists.txt index e0477424..f43c9666 100644 --- a/test_conformance/images/kernel_image_methods/CMakeLists.txt +++ b/test_conformance/images/kernel_image_methods/CMakeLists.txt @@ -8,17 +8,6 @@ set(${MODULE_NAME}_SOURCES test_2D_array.cpp test_loops.cpp test_3D.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/threadTesting.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/imageHelpers.cpp - ../../../test_common/harness/mt19937.c - ../../../test_common/harness/conversions.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/typeWrappers.cpp - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/kernel_read_write/CMakeLists.txt b/test_conformance/images/kernel_read_write/CMakeLists.txt index 808f285f..d7b5f66a 100644 --- a/test_conformance/images/kernel_read_write/CMakeLists.txt +++ b/test_conformance/images/kernel_read_write/CMakeLists.txt @@ -13,17 +13,6 @@ set(${MODULE_NAME}_SOURCES test_write_1D_array.cpp test_write_2D_array.cpp test_write_3D.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/threadTesting.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/imageHelpers.cpp - ../../../test_common/harness/mt19937.c - ../../../test_common/harness/conversions.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/typeWrappers.cpp - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/images/samplerlessReads/CMakeLists.txt b/test_conformance/images/samplerlessReads/CMakeLists.txt index 4926ef4d..ce9b3a9c 100644 --- a/test_conformance/images/samplerlessReads/CMakeLists.txt +++ b/test_conformance/images/samplerlessReads/CMakeLists.txt @@ -9,17 +9,6 @@ set(${MODULE_NAME}_SOURCES test_read_1D_buffer.cpp test_read_1D_array.cpp test_read_2D_array.cpp - ../../../test_common/harness/errorHelpers.c - ../../../test_common/harness/threadTesting.c - ../../../test_common/harness/kernelHelpers.c - ../../../test_common/harness/imageHelpers.cpp - ../../../test_common/harness/mt19937.c - ../../../test_common/harness/conversions.c - ../../../test_common/harness/testHarness.c - ../../../test_common/harness/typeWrappers.cpp - ../../../test_common/harness/msvc9.c - ../../../test_common/harness/parseParameters.cpp - ../../../test_common/harness/crc32.c ) include(../../CMakeCommon.txt) diff --git a/test_conformance/integer_ops/CMakeLists.txt b/test_conformance/integer_ops/CMakeLists.txt index 4f49c71f..77e155f0 100644 --- a/test_conformance/integer_ops/CMakeLists.txt +++ b/test_conformance/integer_ops/CMakeLists.txt @@ -11,16 +11,6 @@ set(${MODULE_NAME}_SOURCES test_unary_ops.cpp verification_and_generation_functions.c test_popcount.c - ../../test_common/harness/ThreadPool.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/math_brute_force/CMakeLists.txt b/test_conformance/math_brute_force/CMakeLists.txt index f0b39c6c..c510ea1c 100644 --- a/test_conformance/math_brute_force/CMakeLists.txt +++ b/test_conformance/math_brute_force/CMakeLists.txt @@ -19,15 +19,6 @@ set(${MODULE_NAME}_SOURCES unary_two_results.c unary_two_results_i.c unary_u.c - ../../test_common/harness/rounding_mode.c - ../../test_common/harness/ThreadPool.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/crc32.c ) @@ -50,11 +41,6 @@ set_source_files_properties( COMPILE_FLAGS -msse2 ) endif(NOT ANDROID) -set_source_files_properties( - ${MODULE_NAME}_SOURCES - ../../test_common/harness/crc32.c - PROPERTIES LANGUAGE CXX) - if (NOT CMAKE_CL_64 AND NOT MSVC AND NOT ANDROID) set_source_files_properties( ${MODULE_NAME}_SOURCES diff --git a/test_conformance/mem_host_flags/CMakeLists.txt b/test_conformance/mem_host_flags/CMakeLists.txt index d1d2b794..73a36f0d 100644 --- a/test_conformance/mem_host_flags/CMakeLists.txt +++ b/test_conformance/mem_host_flags/CMakeLists.txt @@ -4,18 +4,6 @@ set(${MODULE_NAME}_SOURCES main.cpp mem_host_buffer.cpp mem_host_image.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/genericThread.cpp - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/ThreadPool.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/multiple_device_context/CMakeLists.txt b/test_conformance/multiple_device_context/CMakeLists.txt index fe1fd227..b8f124a2 100644 --- a/test_conformance/multiple_device_context/CMakeLists.txt +++ b/test_conformance/multiple_device_context/CMakeLists.txt @@ -4,17 +4,6 @@ set(${MODULE_NAME}_SOURCES main.c test_multiple_contexts.c test_multiple_devices.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/genericThread.cpp - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/conversions.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) @@ -24,14 +13,6 @@ set_source_files_properties( set_source_files_properties( main.c test_multiple_contexts.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c PROPERTIES LANGUAGE CXX) include(../CMakeCommon.txt) diff --git a/test_conformance/non_uniform_work_group/CMakeLists.txt b/test_conformance/non_uniform_work_group/CMakeLists.txt index ea2cc1af..30c3a846 100644 --- a/test_conformance/non_uniform_work_group/CMakeLists.txt +++ b/test_conformance/non_uniform_work_group/CMakeLists.txt @@ -8,12 +8,6 @@ set(${MODULE_NAME}_SOURCES test_basic.cpp TestNonUniformWorkGroup.cpp tools.cpp - ../../test_common/harness/testHarness.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/pipes/CMakeLists.txt b/test_conformance/pipes/CMakeLists.txt index 63bd916e..5b4d803a 100644 --- a/test_conformance/pipes/CMakeLists.txt +++ b/test_conformance/pipes/CMakeLists.txt @@ -8,16 +8,6 @@ set(${MODULE_NAME}_SOURCES test_pipe_query_functions.c test_pipe_readwrite_errors.c test_pipe_subgroups.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/printf/CMakeLists.txt b/test_conformance/printf/CMakeLists.txt index 71d73c16..84b988db 100644 --- a/test_conformance/printf/CMakeLists.txt +++ b/test_conformance/printf/CMakeLists.txt @@ -5,18 +5,6 @@ set(CMAKE_CXX_STANDARD 11) set(${MODULE_NAME}_SOURCES test_printf.c util_printf.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/conversions.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/testHarness.c - #../../test_common/harness/imageHelpers.cpp - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/profiling/CMakeLists.txt b/test_conformance/profiling/CMakeLists.txt index 914d3295..310163fa 100644 --- a/test_conformance/profiling/CMakeLists.txt +++ b/test_conformance/profiling/CMakeLists.txt @@ -9,16 +9,6 @@ set(${MODULE_NAME}_SOURCES copy.c execute.c execute_multipass.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/imageHelpers.cpp - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/relationals/CMakeLists.txt b/test_conformance/relationals/CMakeLists.txt index 81da7d2d..997c759b 100644 --- a/test_conformance/relationals/CMakeLists.txt +++ b/test_conformance/relationals/CMakeLists.txt @@ -6,15 +6,6 @@ set(${MODULE_NAME}_SOURCES test_comparisons_float.cpp test_comparisons_double.cpp test_shuffles.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/select/CMakeLists.txt b/test_conformance/select/CMakeLists.txt index 97bd24b2..8d2c25bd 100644 --- a/test_conformance/select/CMakeLists.txt +++ b/test_conformance/select/CMakeLists.txt @@ -3,13 +3,6 @@ set(MODULE_NAME SELECT) set(${MODULE_NAME}_SOURCES test_select.c util_select.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/spir/CMakeLists.txt b/test_conformance/spir/CMakeLists.txt index c794cd2d..9e0b15e4 100644 --- a/test_conformance/spir/CMakeLists.txt +++ b/test_conformance/spir/CMakeLists.txt @@ -9,16 +9,8 @@ set (SPIR_SOURCES run_build_test.cpp run_services.cpp kernelargs.cpp - ../../test_common/harness/parseParameters.cpp ../math_brute_force/FunctionList.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/os_helpers.cpp - ../../test_common/harness/testHarness.c - ../../test_common/miniz/miniz.c - ../../test_common/harness/crc32.c) +) add_executable(${SPIR_OUT} ${SPIR_SOURCES}) @@ -36,7 +28,7 @@ elseif(MSVC) COMPILE_FLAGS "/GR /EHs /EHc") endif() -TARGET_LINK_LIBRARIES(${SPIR_OUT} +TARGET_LINK_LIBRARIES(${SPIR_OUT} harness ${CLConform_LIBRARIES}) diff --git a/test_conformance/spirv_new/CMakeLists.txt b/test_conformance/spirv_new/CMakeLists.txt index 48e0706b..7e7daf18 100644 --- a/test_conformance/spirv_new/CMakeLists.txt +++ b/test_conformance/spirv_new/CMakeLists.txt @@ -17,18 +17,6 @@ set(CMAKE_CXX_STANDARD 11) file(GLOB SPIRV_NEW_SOURCES "*.cpp") set(TEST_HARNESS_SOURCES - ../../test_common/harness/crc32.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/rounding_mode.c - ../../test_common/harness/os_helpers.cpp - ../../test_common/harness/parseParameters.cpp ../../test_conformance/math_brute_force/reference_math.c ../../test_conformance/math_brute_force/Utility.c ) diff --git a/test_conformance/subgroups/CMakeLists.txt b/test_conformance/subgroups/CMakeLists.txt index 7e7c11ce..174a9fe7 100644 --- a/test_conformance/subgroups/CMakeLists.txt +++ b/test_conformance/subgroups/CMakeLists.txt @@ -6,16 +6,6 @@ set(${MODULE_NAME}_SOURCES test_queries.cpp test_workitem.cpp test_workgroup.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/ThreadPool.c - ../../test_common/harness/conversions.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt) diff --git a/test_conformance/thread_dimensions/CMakeLists.txt b/test_conformance/thread_dimensions/CMakeLists.txt index 68569771..28f27bf1 100644 --- a/test_conformance/thread_dimensions/CMakeLists.txt +++ b/test_conformance/thread_dimensions/CMakeLists.txt @@ -3,16 +3,6 @@ set(MODULE_NAME THREAD_DIMENSIONS) set(${MODULE_NAME}_SOURCES main.c test_thread_dimensions.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/typeWrappers.cpp - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) set_source_files_properties( diff --git a/test_conformance/vec_align/CMakeLists.txt b/test_conformance/vec_align/CMakeLists.txt index c66f559a..059468da 100644 --- a/test_conformance/vec_align/CMakeLists.txt +++ b/test_conformance/vec_align/CMakeLists.txt @@ -6,14 +6,6 @@ set(${MODULE_NAME}_SOURCES structs.c test_vec_align.c type_replacer.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/conversions.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) set_source_files_properties( diff --git a/test_conformance/vec_step/CMakeLists.txt b/test_conformance/vec_step/CMakeLists.txt index f9cf1a69..85a253c9 100644 --- a/test_conformance/vec_step/CMakeLists.txt +++ b/test_conformance/vec_step/CMakeLists.txt @@ -6,13 +6,6 @@ set(${MODULE_NAME}_SOURCES main.c structs.c type_replacer.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) set_source_files_properties( diff --git a/test_conformance/workgroups/CMakeLists.txt b/test_conformance/workgroups/CMakeLists.txt index 0fc0c860..ab0f28ec 100644 --- a/test_conformance/workgroups/CMakeLists.txt +++ b/test_conformance/workgroups/CMakeLists.txt @@ -14,14 +14,6 @@ set(${MODULE_NAME}_SOURCES test_wg_scan_inclusive_add.c test_wg_scan_inclusive_min.c test_wg_scan_inclusive_max.c - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/msvc9.c - ../../test_common/harness/conversions.c - ../../test_common/harness/parseParameters.cpp - ../../test_common/harness/crc32.c ) include(../CMakeCommon.txt)