diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt index 3270749312..a3d3cf87da 100644 --- a/level_zero/core/test/aub_tests/CMakeLists.txt +++ b/level_zero/core/test/aub_tests/CMakeLists.txt @@ -13,7 +13,6 @@ get_property(NEO_SHARED_aub_tests_configurations GLOBAL PROPERTY NEO_SHARED_aub_ list(APPEND L0_AUB_TESTS__TARGET_OBJECTS ${CMAKE_CURRENT_SOURCE_DIR}/aub_hello_world_test.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/main.cpp ${NEO_SHARED_aub_tests_configurations} ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h @@ -131,7 +130,7 @@ else() endif() target_include_directories(${TARGET_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/aub_tests ${NEO_SOURCE_DIR}/shared/test/common/helpers/includes${BRANCH_DIR_SUFFIX} ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/gmm_memory diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt index 927d3f28c8..9c1a93b68a 100644 --- a/level_zero/core/test/unit_tests/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/CMakeLists.txt @@ -29,9 +29,9 @@ target_sources(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock.h - ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${CMAKE_CURRENT_SOURCE_DIR}/white_box.h ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/common/gen_kernel.cmake ) @@ -85,6 +85,7 @@ target_include_directories(${TARGET_NAME} $/core/os_interface ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX} + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ) if(UNIX) @@ -93,7 +94,6 @@ if(UNIX) PRIVATE $/core/os_interface/linux $/tools/linux - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/linux ) else() target_include_directories(${TARGET_NAME} @@ -101,7 +101,6 @@ else() PRIVATE $/core/os_interface/windows $/tools/windows - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/windows ) endif() diff --git a/level_zero/core/test/unit_tests/test_mode.h b/level_zero/core/test/unit_tests/test_mode.h deleted file mode 100644 index 9be8903fdc..0000000000 --- a/level_zero/core/test/unit_tests/test_mode.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -#include "shared/test/unit_test/tests_configuration.h" - -namespace NEO { -constexpr TestMode defaultTestMode = TestMode::UnitTests; -} // namespace NEO diff --git a/level_zero/experimental/test/unit_tests/CMakeLists.txt b/level_zero/experimental/test/unit_tests/CMakeLists.txt index 070c0af514..132960a485 100644 --- a/level_zero/experimental/test/unit_tests/CMakeLists.txt +++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt @@ -37,9 +37,9 @@ target_sources( ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/main.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h - ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/test_mode.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp ) @@ -98,20 +98,9 @@ target_include_directories( PRIVATE $/experimental ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ) -if(UNIX) - target_include_directories( - ${TARGET_NAME} BEFORE - PRIVATE ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/linux - ) -else() - target_include_directories( - ${TARGET_NAME} BEFORE - PRIVATE ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/windows - ) -endif() - if(UNIX) target_link_libraries(${TARGET_NAME} pthread rt) else() diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt index daad0dcbc5..1158fde510 100644 --- a/level_zero/tools/test/unit_tests/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/CMakeLists.txt @@ -28,11 +28,11 @@ target_sources(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/main.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/mock.h - ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/test_mode.h ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/white_box.h ${NEO_SOURCE_DIR}/level_zero/core/source/dll/create_builtin_functions_lib.cpp ${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp ) @@ -79,23 +79,10 @@ target_include_directories(${TARGET_NAME} PRIVATE $/tools ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ${IGC_COMMON_PARENT_DIR} ) -if(UNIX) - target_include_directories(${TARGET_NAME} - BEFORE - PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/linux - ) -else() - target_include_directories(${TARGET_NAME} - BEFORE - PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/windows - ) -endif() - if(UNIX) target_link_libraries(${TARGET_NAME} pthread rt) else() diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index a0083a4a37..8e303be155 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -29,6 +29,7 @@ add_dependencies(unit_tests copy_test_files_per_product) set(IGDRCL_SRCS_tests_local ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp @@ -123,7 +124,7 @@ target_include_directories(igdrcl_tests PRIVATE ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX} ${ENGINE_NODE_DIR} ${KHRONOS_GL_HEADERS_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/config + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ) target_link_libraries(igdrcl_tests gmock-gtest ${IGDRCL_EXTRA_LIBS}) diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt index db78c20ab3..d6e4a7050b 100644 --- a/opencl/test/unit_test/aub_tests/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt @@ -52,7 +52,7 @@ if(WIN32) endif() target_include_directories(igdrcl_aub_tests PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/aub_tests ${NEO_SOURCE_DIR}/shared/test/common/helpers/includes${BRANCH_DIR_SUFFIX} ) @@ -60,7 +60,6 @@ target_sources(igdrcl_aub_tests PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/unit_test/page_fault_manager/default_asan_options.cpp ${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ) if(WIN32) diff --git a/opencl/test/unit_test/aub_tests/test_mode.h b/opencl/test/unit_test/aub_tests/test_mode.h deleted file mode 100644 index 256f8e2973..0000000000 --- a/opencl/test/unit_test/aub_tests/test_mode.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2019-2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -#include "shared/test/unit_test/tests_configuration.h" - -namespace NEO { -constexpr TestMode defaultTestMode = TestMode::AubTests; -} // namespace NEO diff --git a/opencl/test/unit_test/config/test_mode.h b/opencl/test/unit_test/config/test_mode.h deleted file mode 100644 index 47281c21c4..0000000000 --- a/opencl/test/unit_test/config/test_mode.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2019-2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -#include "shared/test/unit_test/tests_configuration.h" - -namespace NEO { -constexpr TestMode defaultTestMode = TestMode::UnitTests; -} // namespace NEO diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt index 3e4f2f7e2e..379c7f89db 100644 --- a/opencl/test/unit_test/linux/CMakeLists.txt +++ b/opencl/test/unit_test/linux/CMakeLists.txt @@ -20,7 +20,6 @@ add_executable(igdrcl_${target_name} ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_linux_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp ${NEO_SOURCE_DIR}/opencl/source/dll/create_memory_manager_drm.cpp @@ -31,6 +30,7 @@ add_executable(igdrcl_${target_name} ${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/linux${BRANCH_DIR_SUFFIX}drm_other_requests.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h ) if(NEO__LIBVA_FOUND) target_sources(igdrcl_${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/va_tests.cpp) @@ -49,7 +49,7 @@ target_include_directories(igdrcl_${target_name} PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} ${NEO_SHARED_DIRECTORY}/dll/linux/devices${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX} - ${CMAKE_CURRENT_SOURCE_DIR} + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ) add_dependencies(unit_tests igdrcl_${target_name}) add_subdirectories() diff --git a/opencl/test/unit_test/linux/test_mode.h b/opencl/test/unit_test/linux/test_mode.h deleted file mode 100644 index ed7cc93737..0000000000 --- a/opencl/test/unit_test/linux/test_mode.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2019-2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -#include "shared/test/unit_test/tests_configuration.h" - -namespace NEO { -constexpr TestMode defaultTestMode = TestMode::NotSpecified; -} // namespace NEO diff --git a/opencl/test/unit_test/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt index 690a0d9d68..0e853c749c 100644 --- a/opencl/test/unit_test/mt_tests/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt @@ -11,8 +11,8 @@ set(OPENCL_MT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) add_custom_target(run_mt_unit_tests) add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp @@ -27,7 +27,7 @@ add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL ) target_include_directories(igdrcl_mt_tests PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/source/gen_common ) diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt index 1a217a6030..93d7df08c7 100644 --- a/opencl/test/unit_test/windows/CMakeLists.txt +++ b/opencl/test/unit_test/windows/CMakeLists.txt @@ -28,16 +28,16 @@ if(WIN32) ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}get_devices_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp ) target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS}) target_include_directories(igdrcl_windows_dll_tests PRIVATE + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX} - ${CMAKE_CURRENT_SOURCE_DIR} ) create_project_source_tree(igdrcl_windows_dll_tests) diff --git a/opencl/test/unit_test/windows/test_mode.h b/opencl/test/unit_test/windows/test_mode.h deleted file mode 100644 index 47281c21c4..0000000000 --- a/opencl/test/unit_test/windows/test_mode.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2019-2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -#include "shared/test/unit_test/tests_configuration.h" - -namespace NEO { -constexpr TestMode defaultTestMode = TestMode::UnitTests; -} // namespace NEO diff --git a/shared/test/common/test_configuration/aub_tests/CMakeLists.txt b/shared/test/common/test_configuration/aub_tests/CMakeLists.txt index 1a12d9f8c1..033e82ed29 100644 --- a/shared/test/common/test_configuration/aub_tests/CMakeLists.txt +++ b/shared/test/common/test_configuration/aub_tests/CMakeLists.txt @@ -9,6 +9,7 @@ set(NEO_SHARED_aub_tests_configurations ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.h ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.inl + ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ) add_subdirectories() diff --git a/level_zero/core/test/aub_tests/test_mode.h b/shared/test/common/test_configuration/aub_tests/test_mode.h similarity index 82% rename from level_zero/core/test/aub_tests/test_mode.h rename to shared/test/common/test_configuration/aub_tests/test_mode.h index 2655421841..9fc45a10f1 100644 --- a/level_zero/core/test/aub_tests/test_mode.h +++ b/shared/test/common/test_configuration/aub_tests/test_mode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/opencl/test/unit_test/mt_tests/test_mode.h b/shared/test/common/test_configuration/unit_tests/test_mode.h similarity index 82% rename from opencl/test/unit_test/mt_tests/test_mode.h rename to shared/test/common/test_configuration/unit_tests/test_mode.h index 47281c21c4..9687c5bb56 100644 --- a/opencl/test/unit_test/mt_tests/test_mode.h +++ b/shared/test/common/test_configuration/unit_tests/test_mode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index 239aeba3d0..b44309f82d 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -25,13 +25,13 @@ if(NOT SKIP_UNIT_TESTS) add_executable(${TARGET_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h ${CMAKE_CURRENT_SOURCE_DIR}/ult_specific_config.cpp ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/api_specific_config_shared_tests.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp $ $ @@ -71,7 +71,7 @@ if(NOT SKIP_UNIT_TESTS) set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}") target_include_directories(${TARGET_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} + ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ${ENGINE_NODE_DIR} ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX} ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX} diff --git a/shared/test/unit_test/test_mode.h b/shared/test/unit_test/test_mode.h deleted file mode 100644 index 9be8903fdc..0000000000 --- a/shared/test/unit_test/test_mode.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -#include "shared/test/unit_test/tests_configuration.h" - -namespace NEO { -constexpr TestMode defaultTestMode = TestMode::UnitTests; -} // namespace NEO