From 5f97ff1513721004bc1d1c4028578189b7e295cb Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Thu, 7 Oct 2021 15:08:41 +0000 Subject: [PATCH] Move common test files to shared libult Signed-off-by: Mateusz Jablonski --- level_zero/cmake/l0_tests.cmake | 2 -- level_zero/core/test/aub_tests/CMakeLists.txt | 3 --- level_zero/core/test/unit_tests/CMakeLists.txt | 1 - level_zero/experimental/test/unit_tests/CMakeLists.txt | 1 - level_zero/tools/test/unit_tests/CMakeLists.txt | 1 - opencl/test/unit_test/libult/CMakeLists.txt | 3 --- shared/test/common/libult/CMakeLists.txt | 3 +++ {opencl/test/unit_test => shared/test/common/libult}/abort.cpp | 0 .../test/common/libult}/debug_settings_reader_creator.cpp | 2 +- .../unit_test => shared/test/common}/libult/io_functions.cpp | 0 shared/test/unit_test/CMakeLists.txt | 1 - 11 files changed, 4 insertions(+), 13 deletions(-) rename {opencl/test/unit_test => shared/test/common/libult}/abort.cpp (100%) rename {opencl/test/unit_test/utilities => shared/test/common/libult}/debug_settings_reader_creator.cpp (88%) rename {opencl/test/unit_test => shared/test/common}/libult/io_functions.cpp (100%) diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake index 66fd7046e9..edc76f7351 100644 --- a/level_zero/cmake/l0_tests.cmake +++ b/level_zero/cmake/l0_tests.cmake @@ -43,11 +43,9 @@ add_library(compute_runtime_mockable_extra ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_sip.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_program.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp ${NEO_SHARED_DIRECTORY}/debug_settings/debug_settings_manager.cpp ) diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt index 4016f16984..5f6dab5b39 100644 --- a/level_zero/core/test/aub_tests/CMakeLists.txt +++ b/level_zero/core/test/aub_tests/CMakeLists.txt @@ -82,10 +82,7 @@ if(TARGET ${BUILTINS_SPIRV_LIB_NAME}) endif() target_sources(${TARGET_NAME} PRIVATE - ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp ) if(UNIX) diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt index cfb1c227c4..cf717008ff 100644 --- a/level_zero/core/test/unit_tests/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/CMakeLists.txt @@ -38,7 +38,6 @@ target_sources(${TARGET_NAME} PRIVATE ) target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp $ $ $ diff --git a/level_zero/experimental/test/unit_tests/CMakeLists.txt b/level_zero/experimental/test/unit_tests/CMakeLists.txt index e6ce6190ff..070c0af514 100644 --- a/level_zero/experimental/test/unit_tests/CMakeLists.txt +++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt @@ -46,7 +46,6 @@ target_sources( target_sources( ${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp $ $ $ diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt index d24de44009..daad0dcbc5 100644 --- a/level_zero/tools/test/unit_tests/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/CMakeLists.txt @@ -37,7 +37,6 @@ target_sources(${TARGET_NAME} PRIVATE ) target_sources(${TARGET_NAME} PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp $ $ $ diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index 39c1eb0b24..ee21989322 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -19,13 +19,10 @@ apply_macro_for_each_gen("TESTED") set(IGDRCL_SRCS_LIB_ULT ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp ${NEO_SOURCE_DIR}/opencl/source/dll/debug_manager.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.h - ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_command_stream_receiver.h - ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp ${NEO_SOURCE_DIR}/shared/source/helpers/allow_deferred_deleter.cpp ) diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index c99e14c83a..8a89035ae9 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -66,9 +66,12 @@ set(igdrcl_libult_common_SRCS_LIB_ULT ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/sip_init.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.h + ${NEO_SHARED_TEST_DIRECTORY}/common/libult/abort.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/libult/debug_settings_reader_creator.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/global_environment.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/global_environment.h + ${NEO_SHARED_TEST_DIRECTORY}/common/libult/io_functions.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/options_unit_tests.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.h diff --git a/opencl/test/unit_test/abort.cpp b/shared/test/common/libult/abort.cpp similarity index 100% rename from opencl/test/unit_test/abort.cpp rename to shared/test/common/libult/abort.cpp diff --git a/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp b/shared/test/common/libult/debug_settings_reader_creator.cpp similarity index 88% rename from opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp rename to shared/test/common/libult/debug_settings_reader_creator.cpp index 9cdc344eda..f668f69559 100644 --- a/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp +++ b/shared/test/common/libult/debug_settings_reader_creator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/opencl/test/unit_test/libult/io_functions.cpp b/shared/test/common/libult/io_functions.cpp similarity index 100% rename from opencl/test/unit_test/libult/io_functions.cpp rename to shared/test/common/libult/io_functions.cpp diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index b1b82060ec..94675a6204 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -28,7 +28,6 @@ if(NOT SKIP_UNIT_TESTS) ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/api_specific_config_shared_tests.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp