Move files from shared/test/unit_test to /common (preamble, utilities)

unit_test/preamble/preamble_fixture.h -> common/fixtures unit_test/source_level_debugger -> common/ unit_test/utilities/base_object_utils.h -> common/utilities unit_test/utilities/destructor_counted.h -> common/utilities unit_test/utilities/logger_tests.h -> common/utilities Related-To: NEO-6524 Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>
2025-11-15 10:14:56 +08:00 · 2022-08-11 15:58:56 +00:00
parent 649cd3441a
commit d795182eae
93 changed files with 175 additions and 211 deletions
--- a/shared/test/common/fixtures/CMakeLists.txt
+++ b/shared/test/common/fixtures/CMakeLists.txt
@@ -8,6 +8,7 @@ target_sources(neo_libult_common PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/linear_stream_fixture.h
               ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_center_fixture.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/preamble_fixture.h
 )

 add_subdirectories()
--- a/shared/test/unit_test/preamble/preamble_fixture.h
+++ b/shared/test/unit_test/preamble/preamble_fixture.h
--- a/shared/test/common/os_interface/CMakeLists.txt
+++ b/shared/test/common/os_interface/CMakeLists.txt
@@ -1,11 +1,9 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
-               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-)
+target_sources(neo_libult_common PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)

-add_subdirectories()
+add_subdirectories()
--- a/shared/test/common/os_interface/linux/CMakeLists.txt
+++ b/shared/test/common/os_interface/linux/CMakeLists.txt
@@ -5,15 +5,16 @@
 #

 if(UNIX)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_libult_common PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_fixture.h
                 ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_fixture.h
                 ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock_cache_info.h
                 ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock_device_blob.h
  )
+
  if(NEO_ENABLE_i915_PRELIM_DETECTION)
-    target_sources(${TARGET_NAME} PRIVATE
+    target_sources(neo_libult_common PRIVATE
                   ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream_fixture_context.cpp
                   ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream_fixture_context.h
                   ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream_fixture_prelim.h
@@ -21,4 +22,5 @@ if(UNIX)
    )
  endif()
 endif()
-add_subdirectories()
+
+add_subdirectories()
--- a/shared/test/common/os_interface/windows/CMakeLists.txt
+++ b/shared/test/common/os_interface/windows/CMakeLists.txt
@@ -1,15 +1,13 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_libult_common PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/gdi_dll_fixture.h
               ${CMAKE_CURRENT_SOURCE_DIR}/mock_sys_calls.h
               ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_memory_manager.h
               ${CMAKE_CURRENT_SOURCE_DIR}/wddm_fixture.h
-)
-
-set_property(GLOBAL PROPERTY NEO_CORE_SHARED_TESTS_OS_INTERFACE_WINDOWS ${NEO_CORE_SHARED_TESTS_OS_INTERFACE_WINDOWS})
+)
--- a/shared/test/unit_test/source_level_debugger/CMakeLists.txt
+++ b/shared/test/unit_test/source_level_debugger/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
--- a/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h
+++ b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h
--- a/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.inl
+++ b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.inl
--- a/shared/test/common/utilities/CMakeLists.txt
+++ b/shared/test/common/utilities/CMakeLists.txt
@@ -0,0 +1,12 @@
+#
+# Copyright (C) 2022 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+target_sources(neo_libult_common PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/base_object_utils.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/destructor_counted.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/logger_tests.h
+)
--- a/shared/test/unit_test/utilities/base_object_utils.h
+++ b/shared/test/unit_test/utilities/base_object_utils.h
--- a/shared/test/unit_test/utilities/destructor_counted.h
+++ b/shared/test/unit_test/utilities/destructor_counted.h
--- a/shared/test/unit_test/utilities/logger_tests.h
+++ b/shared/test/unit_test/utilities/logger_tests.h
--- a/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp
+++ b/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp
@@ -11,7 +11,7 @@
 #include "shared/test/common/debug_settings/debug_settings_manager_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"

 #include <cstdio>
 #include <memory>
--- a/shared/test/unit_test/gen11/preamble_tests_gen11.cpp
+++ b/shared/test/unit_test/gen11/preamble_tests_gen11.cpp
@@ -6,14 +6,14 @@
 */

 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h"
+#include "shared/test/common/source_level_debugger/source_level_debugger_preamble_test.h"

 #include "gtest/gtest.h"

 using namespace NEO;
 typedef Gen11Family GfxFamily;

-#include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.inl"
+#include "shared/test/common/source_level_debugger/source_level_debugger_preamble_test.inl"

 using PreambleTestGen11 = ::testing::Test;

--- a/shared/test/unit_test/gen11/test_preamble_gen11.cpp
+++ b/shared/test/unit_test/gen11/test_preamble_gen11.cpp
@@ -8,8 +8,8 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/stream_properties.h"
+#include "shared/test/common/fixtures/preamble_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/unit_test/preamble/preamble_fixture.h"

 #include "reg_configs_common.h"

--- a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp
+++ b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp
@@ -7,8 +7,8 @@

 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/stream_properties.h"
+#include "shared/test/common/fixtures/preamble_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/unit_test/preamble/preamble_fixture.h"

 #include "reg_configs_common.h"

--- a/shared/test/unit_test/gen8/test_preamble_gen8.cpp
+++ b/shared/test/unit_test/gen8/test_preamble_gen8.cpp
@@ -10,7 +10,7 @@
 #include "shared/source/command_stream/thread_arbitration_policy.h"
 #include "shared/source/gen8/reg_configs.h"
 #include "shared/source/helpers/preamble.h"
-#include "shared/test/unit_test/preamble/preamble_fixture.h"
+#include "shared/test/common/fixtures/preamble_fixture.h"

 using namespace NEO;

--- a/shared/test/unit_test/gen9/preamble_tests_gen9.cpp
+++ b/shared/test/unit_test/gen9/preamble_tests_gen9.cpp
@@ -6,16 +6,16 @@
 */

 #include "shared/source/command_container/command_encoder.h"
+#include "shared/test/common/fixtures/preamble_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/unit_test/preamble/preamble_fixture.h"
-#include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h"
+#include "shared/test/common/source_level_debugger/source_level_debugger_preamble_test.h"

 #include "gtest/gtest.h"

 using namespace NEO;
 typedef Gen9Family GfxFamily;

-#include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.inl"
+#include "shared/test/common/source_level_debugger/source_level_debugger_preamble_test.inl"

 using PreambleTestGen9 = ::testing::Test;

--- a/shared/test/unit_test/gen9/test_preamble_gen9.cpp
+++ b/shared/test/unit_test/gen9/test_preamble_gen9.cpp
@@ -11,8 +11,8 @@
 #include "shared/source/gen9/reg_configs.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
+#include "shared/test/common/fixtures/preamble_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/unit_test/preamble/preamble_fixture.h"

 using namespace NEO;

--- a/shared/test/unit_test/os_interface/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/CMakeLists.txt
@@ -4,34 +4,19 @@
 # SPDX-License-Identifier: MIT
 #

-set(NEO_CORE_OS_INTERFACE_AUB_TESTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler_tests.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_context_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_library_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_tests.cpp
-)
-
-set(NEO_CORE_OS_INTERFACE_TESTS
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/device_uuid_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+target_sources(neo_shared_tests PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler_tests.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/device_uuid_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/os_context_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/os_library_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_tests.cpp
 )

 if(WIN32 OR(UNIX AND NOT DISABLE_WDDM_LINUX))
-  list(APPEND NEO_CORE_OS_INTERFACE_TESTS
-       ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_logging_tests.cpp
-  )
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_logging_tests.cpp)
 endif()

-set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_TESTS ${NEO_CORE_OS_INTERFACE_TESTS})
-
-set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_AUB_TESTS ${NEO_CORE_OS_INTERFACE_AUB_TESTS})
-
-target_sources(${TARGET_NAME} PRIVATE
-               ${NEO_CORE_OS_INTERFACE_TESTS}
-               ${NEO_CORE_OS_INTERFACE_AUB_TESTS}
-)
-
-add_subdirectories()
+add_subdirectories()
--- a/shared/test/unit_test/os_interface/linux/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/linux/CMakeLists.txt
@@ -87,8 +87,7 @@ endif()
 set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_TESTS_LINUX ${NEO_CORE_OS_INTERFACE_TESTS_LINUX})

 if(UNIX)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${NEO_CORE_OS_INTERFACE_TESTS_LINUX}
-  )
+  target_sources(neo_shared_tests PRIVATE ${NEO_CORE_OS_INTERFACE_TESTS_LINUX})
 endif()
-add_subdirectories()
+
+add_subdirectories()
--- a/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp
@@ -9,7 +9,7 @@
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/linux/mock_drm_allocation.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/utilities/logger_tests.h"
+#include "shared/test/common/utilities/logger_tests.h"

 using namespace NEO;

--- a/shared/test/unit_test/os_interface/wddm_linux/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/wddm_linux/CMakeLists.txt
@@ -1,18 +1,12 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-set(NEO_CORE_OS_INTERFACE_TESTS_WDDM_LINUX
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/configure_device_address_space_drm_or_wddm_test.cpp
-)
-
-set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_TESTS_WDDM_LINUX ${NEO_CORE_OS_INTERFACE_TESTS_WDDM_LINUX})
-
 if(UNIX AND NOT DISABLE_WDDM_LINUX)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${NEO_CORE_OS_INTERFACE_TESTS_WDDM_LINUX}
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/configure_device_address_space_drm_or_wddm_test.cpp
  )
-endif()
+endif()
--- a/shared/test/unit_test/os_interface/windows/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/windows/CMakeLists.txt
@@ -4,37 +4,31 @@
 # SPDX-License-Identifier: MIT
 #

-set(NEO_CORE_OS_INTERFACE_TESTS_WINDOWS
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/adapter_info_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/adapter_info_tests.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper_tests_win.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_context_win_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/self_lib_win.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/um_km_data_translator_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_address_space_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_command_stream_l0_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_mapper_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_preemption_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_shared_allocations_test.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_special_heap_test.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_tests.cpp
-)
-
-set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_TESTS_WINDOWS ${NEO_CORE_OS_INTERFACE_TESTS_WINDOWS})
-
 if(WIN32)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${NEO_CORE_OS_INTERFACE_TESTS_WINDOWS}
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/adapter_info_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/adapter_info_tests.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/gmm_helper_tests_win.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/os_context_win_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_win_tests.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/self_lib_win.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/um_km_data_translator_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/wddm_address_space_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/wddm_command_stream_l0_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/wddm_mapper_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/wddm_preemption_tests.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/wddm_shared_allocations_test.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/wddm_special_heap_test.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/wddm_tests.cpp
  )
 endif()

-add_subdirectories()
+add_subdirectories()
--- a/shared/test/unit_test/preamble/CMakeLists.txt
+++ b/shared/test/unit_test/preamble/CMakeLists.txt
@@ -1,20 +1,18 @@
 #
-# Copyright (C) 2019-2021 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

 set(NEO_CORE_PREAMBLE_TESTS
    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/preamble_fixture.h
    ${CMAKE_CURRENT_SOURCE_DIR}/preamble_tests.cpp
 )

 if(TESTS_XE_HPG_CORE)
-  list(APPEND NEO_CORE_PREAMBLE_TESTS
-       ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpg_core.cpp
-  )
+  list(APPEND NEO_CORE_PREAMBLE_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpg_core.cpp)
 endif()

-target_sources(${TARGET_NAME} PRIVATE ${NEO_CORE_PREAMBLE_TESTS})
-add_subdirectories()
+target_sources(neo_shared_tests PRIVATE ${NEO_CORE_PREAMBLE_TESTS})
+
+add_subdirectories()
--- a/shared/test/unit_test/preemption/CMakeLists.txt
+++ b/shared/test/unit_test/preemption/CMakeLists.txt
@@ -1,18 +1,16 @@
 #
-# Copyright (C) 2019-2021 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/preemption_tests.cpp
 )

 if(TESTS_XEHP_AND_LATER)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xehp_and_later.cpp
-  )
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xehp_and_later.cpp)
 endif()

-add_subdirectories()
+add_subdirectories()
--- a/shared/test/unit_test/scratch_space_controler/CMakeLists.txt
+++ b/shared/test/unit_test/scratch_space_controler/CMakeLists.txt
@@ -1,18 +1,16 @@
 #
-# Copyright (C) 2020-2021 Intel Corporation
+# Copyright (C) 2020-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controler_tests.cpp
 )

 if(TESTS_XEHP_AND_LATER)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controler_xehp_and_later_tests.cpp
-  )
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controler_xehp_and_later_tests.cpp)
 endif()

-add_subdirectories()
+add_subdirectories()
--- a/shared/test/unit_test/unified_memory/CMakeLists.txt
+++ b/shared/test/unit_test/unified_memory/CMakeLists.txt
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_tests.cpp
-)
+)
--- a/shared/test/unit_test/utilities/CMakeLists.txt
+++ b/shared/test/unit_test/utilities/CMakeLists.txt
@@ -4,21 +4,18 @@
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}debug_file_reader_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/base_object_utils.h
               ${CMAKE_CURRENT_SOURCE_DIR}/const_stringref_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/containers_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/containers_tests_helpers.h
               ${CMAKE_CURRENT_SOURCE_DIR}/cpuintrinsics_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader_tests.inl
               ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/destructor_counted.h
               ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/io_functions_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/logger_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/logger_tests.h
               ${CMAKE_CURRENT_SOURCE_DIR}/numeric_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/reference_tracked_object_tests.cpp
@@ -30,4 +27,4 @@ target_sources(${TARGET_NAME} PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/wait_util_tests.cpp
 )

-add_subdirectories()
+add_subdirectories()
--- a/shared/test/unit_test/utilities/aarch64/CMakeLists.txt
+++ b/shared/test/unit_test/utilities/aarch64/CMakeLists.txt
@@ -5,8 +5,8 @@
 #

 if(${NEO_TARGET_PROCESSOR} STREQUAL "aarch64")
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_aarch64.cpp
  )
-endif()
+endif()
--- a/shared/test/unit_test/utilities/linux/CMakeLists.txt
+++ b/shared/test/unit_test/utilities/linux/CMakeLists.txt
@@ -1,16 +1,12 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-set(UTILITIES_CPUINFO_TESTS_LINUX
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_linux.cpp
-)
-
 if(UNIX)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${UTILITIES_CPUINFO_TESTS_LINUX}
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_linux.cpp
  )
-endif()
+endif()
--- a/shared/test/unit_test/utilities/logger_tests.cpp
+++ b/shared/test/unit_test/utilities/logger_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/unit_test/utilities/logger_tests.h"
+#include "shared/test/common/utilities/logger_tests.h"

 #include "shared/source/memory_manager/allocation_type.h"
 #include "shared/source/memory_manager/memory_manager.h"
@@ -13,7 +13,7 @@
 #include "shared/source/utilities/logger.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/gtest_helpers.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/utilities/windows/CMakeLists.txt
+++ b/shared/test/unit_test/utilities/windows/CMakeLists.txt
@@ -1,16 +1,12 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-set(UTILITIES_CPUINFO_TESTS_WINDOWS
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_windows.cpp
-)
-
 if(WIN32)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${UTILITIES_CPUINFO_TESTS_WINDOWS}
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_windows.cpp
  )
-endif()
+endif()
--- a/shared/test/unit_test/utilities/x86_64/CMakeLists.txt
+++ b/shared/test/unit_test/utilities/x86_64/CMakeLists.txt
@@ -5,10 +5,10 @@
 #

 if(${NEO_TARGET_PROCESSOR} STREQUAL "x86_64")
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_x86_64.cpp
  )

  add_subdirectories()
-endif()
+endif()
--- a/shared/test/unit_test/utilities/x86_64/linux/CMakeLists.txt
+++ b/shared/test/unit_test/utilities/x86_64/linux/CMakeLists.txt
@@ -5,7 +5,5 @@
 #

 if(UNIX)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_x86_64_linux.cpp
-  )
-endif()
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_x86_64_linux.cpp)
+endif()
--- a/shared/test/unit_test/xe_hpc_core/pvc/test_preamble_pvc.cpp
+++ b/shared/test/unit_test/xe_hpc_core/pvc/test_preamble_pvc.cpp
@@ -9,8 +9,8 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/test/common/fixtures/preamble_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/unit_test/preamble/preamble_fixture.h"

 using namespace NEO;

--- a/shared/test/unit_test/xe_hpc_core/test_preamble_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/test_preamble_xe_hpc_core.cpp
@@ -9,8 +9,8 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/test/common/fixtures/preamble_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/unit_test/preamble/preamble_fixture.h"

 using namespace NEO;