CMake: don't include shared/test/unit_test when shared tests are skipped 1/n

Related-To: NEO-6524 Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>
2026-01-03 14:55:24 +08:00 · 2022-08-08 15:09:46 +00:00
parent 89264b99e5
commit e7cca25894
64 changed files with 176 additions and 183 deletions
--- a/shared/test/common/CMakeLists.txt
+++ b/shared/test/common/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
-)
+add_library(neo_libult_common OBJECT EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)

 add_subdirectories()
--- a/shared/test/common/built_ins/CMakeLists.txt
+++ b/shared/test/common/built_ins/CMakeLists.txt
@@ -0,0 +1,10 @@
+#
+# 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}/built_in_tests_shared.inl
+)
--- a/shared/test/unit_test/built_ins/built_in_tests_shared.inl
+++ b/shared/test/unit_test/built_ins/built_in_tests_shared.inl
--- a/shared/test/common/cmd_parse/CMakeLists.txt
+++ b/shared/test/common/cmd_parse/CMakeLists.txt
@@ -4,35 +4,30 @@
 # SPDX-License-Identifier: MIT
 #

-set(NEO_SHARED_TESTS_CMD_PARSE
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_3d_state_btd.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base_mi_arb.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_mi_arb.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_mode.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_walker.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_gpgpu_walker.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_l3_control.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_mi_arb.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_sip.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/gen_cmd_parse.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.inl
+target_sources(neo_libult_common PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_3d_state_btd.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base_mi_arb.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_mi_arb.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_mode.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_walker.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_gpgpu_walker.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_l3_control.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_mi_arb.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_sip.inl
+               ${CMAKE_CURRENT_SOURCE_DIR}/gen_cmd_parse.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.inl
 )

 if(TESTS_XEHP_AND_LATER)
-  list(APPEND NEO_SHARED_TESTS_CMD_PARSE
-       ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_l3_control_xehp_and_later.inl
-       ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_xehp_and_later.inl
+  target_sources(neo_libult_common PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_l3_control_xehp_and_later.inl
+                 ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_xehp_and_later.inl
  )
 endif()

 if(TESTS_PVC_AND_LATER)
-  list(APPEND NEO_SHARED_TESTS_CMD_PARSE
-       ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_pvc_and_later.inl
-  )
-endif()
-
-add_subdirectories()
-set_property(GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE ${NEO_SHARED_TESTS_CMD_PARSE})
+  target_sources(neo_libult_common PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_pvc_and_later.inl)
+endif()
--- a/shared/test/common/compiler_interface/CMakeLists.txt
+++ b/shared/test/common/compiler_interface/CMakeLists.txt
@@ -0,0 +1,11 @@
+#
+# 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}/linker_mock.h
+)
+
--- a/shared/test/unit_test/compiler_interface/linker_mock.h
+++ b/shared/test/unit_test/compiler_interface/linker_mock.h
--- a/shared/test/common/device_binary_format/CMakeLists.txt
+++ b/shared/test/common/device_binary_format/CMakeLists.txt
@@ -0,0 +1,11 @@
+#
+# 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}/patchtokens_tests.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/zebin_tests.h
+)
--- a/shared/test/unit_test/device_binary_format/patchtokens_tests.h
+++ b/shared/test/unit_test/device_binary_format/patchtokens_tests.h
--- a/shared/test/unit_test/device_binary_format/zebin_tests.h
+++ b/shared/test/unit_test/device_binary_format/zebin_tests.h
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -43,7 +43,7 @@ macro(macro_for_each_core_type)
      set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${CORE_TYPE_LOWER}/unit_test_helper_${CORE_TYPE_LOWER}.cpp)
      if(EXISTS ${SRC_FILE})
        list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
-        include_directories(${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${CORE_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX})
+        target_include_directories(neo_libult_common PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${CORE_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX})
      endif()
      foreach(SRC_IT "enable_family_full_core_" "implicit_scaling_")
        set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}${SRC_IT}${CORE_TYPE_LOWER}.cpp)
@@ -128,19 +128,15 @@ if(TESTS_XEHP_AND_LATER)
  )
 endif()

-get_property(NEO_SHARED_TESTS_CMD_PARSE GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE)
-list(APPEND neo_libult_common_SRCS_LIB_ULT
-     ${NEO_SHARED_TESTS_CMD_PARSE}
-)
 set_property(GLOBAL PROPERTY neo_libult_common_SRCS_LIB_ULT ${neo_libult_common_SRCS_LIB_ULT})

 set_property(GLOBAL PROPERTY neo_libult_common_SRCS_ENABLE_TESTED_HW ${neo_libult_common_SRCS_ENABLE_TESTED_HW})

 set_property(GLOBAL PROPERTY neo_libult_common_SRCS_ENABLE_TESTED_HW_LINUX ${neo_libult_common_SRCS_ENABLE_TESTED_HW_LINUX})

-add_library(neo_libult_common OBJECT EXCLUDE_FROM_ALL
-            ${neo_libult_common_SRCS_LIB_ULT}
-            ${neo_libult_common_SRCS_ENABLE_TESTED_HW}
+target_sources(neo_libult_common PRIVATE
+               ${neo_libult_common_SRCS_LIB_ULT}
+               ${neo_libult_common_SRCS_ENABLE_TESTED_HW}
 )

 set(neo_libult_common_SRCS_LIB_ULT_WIN
--- a/shared/test/unit_test/ail/CMakeLists.txt
+++ b/shared/test/unit_test/ail/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-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}/ail_tests.cpp
 )

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

-set(NEO_CORE_AIL_TESTS_LINUX
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/ail_linux_tests.cpp
-)
-
-set_property(GLOBAL PROPERTY NEO_CORE_AIL_TESTS_LINUX ${NEO_CORE_AIL_TESTS_LINUX})
-
 if(UNIX)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${NEO_CORE_AIL_TESTS_LINUX}
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/ail_linux_tests.cpp
  )
-endif()
-add_subdirectories()
+endif()
--- a/shared/test/unit_test/ail/windows/CMakeLists.txt
+++ b/shared/test/unit_test/ail/windows/CMakeLists.txt
@@ -1,18 +1,12 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-set(NEO_CORE_AIL_TESTS_WINDOWS
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/ail_windows_tests.cpp
-)
-
-set_property(GLOBAL PROPERTY NEO_CORE_AIL_TESTS_WINDOWS ${NEO_CORE_AIL_TESTS_WINDOWS})
-
 if(WIN32)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${NEO_CORE_AIL_TESTS_WINDOWS}
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/ail_windows_tests.cpp
  )
-endif()
+endif()
--- a/shared/test/unit_test/aub/CMakeLists.txt
+++ b/shared/test/unit_test/aub/CMakeLists.txt
@@ -1,20 +1,17 @@
 #
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2018-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-set(NEO_SHARED_aub_helper_tests
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_center_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_helper_tests.cpp
+target_sources(neo_shared_tests PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_center_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_helper_tests.cpp
 )

 if(NOT DEFINED AUB_STREAM_PROJECT_NAME)
-  list(APPEND NEO_SHARED_aub_helper_tests
-       ${CMAKE_CURRENT_SOURCE_DIR}/aub_center_using_aubstream_stubs_tests.cpp
-  )
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/aub_center_using_aubstream_stubs_tests.cpp)
 endif()

-target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_aub_helper_tests})
 add_subdirectories()
--- a/shared/test/unit_test/aub_mem_dump/CMakeLists.txt
+++ b/shared/test/unit_test/aub_mem_dump/CMakeLists.txt
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-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}/lrca_helper_tests.cpp
 )
--- a/shared/test/unit_test/built_ins/CMakeLists.txt
+++ b/shared/test/unit_test/built_ins/CMakeLists.txt
@@ -1,12 +1,11 @@
 #
-# 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}/built_in_tests_shared.inl
               ${CMAKE_CURRENT_SOURCE_DIR}/sip_tests.cpp
 )

--- a/shared/test/unit_test/command_container/CMakeLists.txt
+++ b/shared/test/unit_test/command_container/CMakeLists.txt
@@ -1,19 +1,15 @@
 #
-# 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}/command_container_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_tests.cpp
 )

 if(TESTS_DG2_AND_LATER)
-  target_sources(${TARGET_NAME} PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_tests_xe_hpg_core_and_later.cpp
-  )
-endif()
-
-add_subdirectories()
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_tests_xe_hpg_core_and_later.cpp)
+endif()
--- a/shared/test/unit_test/command_queue/CMakeLists.txt
+++ b/shared/test/unit_test/command_queue/CMakeLists.txt
@@ -1,12 +1,11 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-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}/flattened_id_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/local_id_tests.cpp
 )
-add_subdirectories()
--- a/shared/test/unit_test/command_stream/CMakeLists.txt
+++ b/shared/test/unit_test/command_stream/CMakeLists.txt
@@ -4,40 +4,36 @@
 # SPDX-License-Identifier: MIT
 #

-set(NEO_SHARED_tests_command_stream
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}stream_properties_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_1_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_2_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_3_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_file_stream_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_subcapture_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/get_devices_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/linear_stream_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/stream_properties_tests_common.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/stream_properties_tests_common.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/tbx_stream_tests.cpp
+target_sources(neo_shared_tests PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}stream_properties_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_1_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_2_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_3_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_file_stream_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_subcapture_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/get_devices_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/linear_stream_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/stream_properties_tests_common.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/stream_properties_tests_common.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/tbx_stream_tests.cpp
 )

 if(TESTS_XEHP_AND_LATER)
-  list(APPEND NEO_SHARED_tests_command_stream
-       ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_tests_xehp_and_later.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xehp_and_later.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_tests_xehp_and_later.cpp
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_tests_xehp_and_later.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xehp_and_later.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_tests_xehp_and_later.cpp
  )
 endif()

 if(TESTS_PVC_AND_LATER)
-  list(APPEND NEO_SHARED_tests_command_stream
-       ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_pvc_and_later.cpp
-  )
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_pvc_and_later.cpp)
 endif()

-target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_tests_command_stream})
-
-add_subdirectories()
+add_subdirectories()
--- a/shared/test/unit_test/compiler_interface/CMakeLists.txt
+++ b/shared/test/unit_test/compiler_interface/CMakeLists.txt
@@ -4,14 +4,13 @@
 # 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}/compiler_cache_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/compiler_interface_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/external_functions_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/intermediate_representations_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/linker_mock.h
               ${CMAKE_CURRENT_SOURCE_DIR}/linker_tests.cpp
 )

--- a/shared/test/unit_test/compiler_interface/linker_tests.cpp
+++ b/shared/test/unit_test/compiler_interface/linker_tests.cpp
@@ -12,18 +12,18 @@
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/program/program_initialization.h"
+#include "shared/test/common/compiler_interface/linker_mock.h"
+#include "shared/test/common/device_binary_format/zebin_tests.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_elf.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
-#include "shared/test/unit_test/device_binary_format/zebin_tests.h"
 #include "shared/test/unit_test/helpers/gtest_helpers.h"

 #include "RelocationInfo.h"
 #include "gtest/gtest.h"
-#include "linker_mock.h"

 #include <string>

--- a/shared/test/unit_test/debugger/CMakeLists.txt
+++ b/shared/test/unit_test/debugger/CMakeLists.txt
@@ -4,7 +4,7 @@
 # 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}/test_l0_debugger.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/test_l0_debugger_single_address_space.cpp
--- a/shared/test/unit_test/device/CMakeLists.txt
+++ b/shared/test/unit_test/device/CMakeLists.txt
@@ -1,11 +1,12 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-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}/neo_device_tests.cpp
 )
-add_subdirectories()
+
+add_subdirectories()
--- a/shared/test/unit_test/device/linux/CMakeLists.txt
+++ b/shared/test/unit_test/device/linux/CMakeLists.txt
@@ -5,9 +5,10 @@
 #

 if(UNIX)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/neo_device_linux_tests.cpp
  )
 endif()
-add_subdirectories()
+
+add_subdirectories()
--- a/shared/test/unit_test/device/windows/CMakeLists.txt
+++ b/shared/test/unit_test/device/windows/CMakeLists.txt
@@ -5,9 +5,10 @@
 #

 if(WIN32)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/neo_device_windows_tests.cpp
  )
 endif()
-add_subdirectories()
+
+add_subdirectories()
--- a/shared/test/unit_test/device_binary_format/CMakeLists.txt
+++ b/shared/test/unit_test/device_binary_format/CMakeLists.txt
@@ -4,7 +4,7 @@
 # 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}/ar/ar_decoder_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/ar/ar_encoder_tests.cpp
@@ -19,11 +19,8 @@ target_sources(${TARGET_NAME} PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/elf/elf_tests_data.h
               ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_decoder_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_dumper_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_tests.h
               ${CMAKE_CURRENT_SOURCE_DIR}/patchtokens_validator_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/yaml/yaml_parser_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/zebin_debug_binary_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/zebin_decoder_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/zebin_tests.h
-)
-
+)
--- a/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp
@@ -14,10 +14,10 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/common/test_macros/test_base.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"

 TEST(IsDeviceBinaryFormatAr, GivenValidBinaryThenReturnTrue) {
    auto emptyArchive = ArrayRef<const uint8_t>::fromAny(NEO::Ar::arMagic.begin(), NEO::Ar::arMagic.size());
--- a/shared/test/unit_test/device_binary_format/device_binary_format_ocl_elf_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/device_binary_format_ocl_elf_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -11,8 +11,8 @@
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/program/program_info.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"

 #include <algorithm>
 #include <tuple>
--- a/shared/test/unit_test/device_binary_format/device_binary_format_patchtokens_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/device_binary_format_patchtokens_tests.cpp
@@ -7,8 +7,8 @@

 #include "shared/source/device_binary_format/device_binary_formats.h"
 #include "shared/source/program/program_info.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"

 TEST(IsDeviceBinaryFormatPatchtokens, GivenValidBinaryThenReturnTrue) {
    PatchTokensTestData::ValidProgramWithKernel programTokens;
--- a/shared/test/unit_test/device_binary_format/device_binary_format_zebin_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/device_binary_format_zebin_tests.cpp
@@ -11,8 +11,8 @@
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/program/program_info.h"
+#include "shared/test/common/device_binary_format/zebin_tests.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/zebin_tests.h"

 TEST(IsDeviceBinaryFormatZebin, GivenValidExecutableTypeBinaryThenReturnTrue) {
    NEO::Elf::ElfFileHeader<NEO::Elf::EI_CLASS_64> zebin;
--- a/shared/test/unit_test/device_binary_format/device_binary_formats_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/device_binary_formats_tests.cpp
@@ -10,9 +10,9 @@
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/program/program_info.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
+#include "shared/test/common/device_binary_format/zebin_tests.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"
-#include "shared/test/unit_test/device_binary_format/zebin_tests.h"

 TEST(DecodeError, WhenStringRepresentationIsNeededThenAsStringEncodesProperly) {
    EXPECT_STREQ("decoded successfully", NEO::asString(NEO::DecodeError::Success));
--- a/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp
@@ -7,11 +7,10 @@

 #include "shared/source/device_binary_format/patchtokens_decoder.h"
 #include "shared/source/helpers/hash.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/test.h"

-#include "patchtokens_tests.h"
-
 #include <vector>

 bool hasEmptyHeaps(const NEO::PatchTokenBinary::KernelFromPatchtokens &kernel) {
--- a/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/device_binary_format/patchtokens_decoder.h"
 #include "shared/source/device_binary_format/patchtokens_dumper.h"
 #include "shared/source/helpers/compiler_hw_info_config.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"

 #include <sstream>
 #include <unordered_set>
--- a/shared/test/unit_test/device_binary_format/patchtokens_validator_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/patchtokens_validator_tests.cpp
@@ -7,7 +7,7 @@

 #include "shared/source/device_binary_format/patchtokens_decoder.h"
 #include "shared/source/device_binary_format/patchtokens_validator.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/device_binary_format/zebin_debug_binary_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/zebin_debug_binary_tests.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/device_binary_format/debug_zebin.h"
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/elf/zebin_elf.h"
+#include "shared/test/common/device_binary_format/zebin_tests.h"
 #include "shared/test/common/mocks/mock_elf.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/zebin_tests.h"

 using namespace NEO::Elf;
 TEST(DebugZebinTest, givenValidZebinThenDebugZebinIsGenerated) {
--- a/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
@@ -12,9 +12,9 @@
 #include "shared/source/helpers/string.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/source/program/program_info.h"
+#include "shared/test/common/device_binary_format/zebin_tests.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/zebin_tests.h"

 #include <vector>

--- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
+++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
@@ -13,6 +13,7 @@
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/kernel/kernel_descriptor_from_patchtokens.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/fixtures/command_container_fixture.h"
 #include "shared/test/common/fixtures/front_window_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
@@ -20,7 +21,6 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_dispatch_kernel_encoder_interface.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"
 #include "shared/test/unit_test/helpers/gtest_helpers.h"

 using namespace NEO;
--- a/shared/test/unit_test/kernel/kernel_descriptor_from_patchtokens_tests.cpp
+++ b/shared/test/unit_test/kernel/kernel_descriptor_from_patchtokens_tests.cpp
@@ -9,9 +9,9 @@
 #include "shared/source/kernel/kernel_arg_descriptor_extended_vme.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/kernel/kernel_descriptor_from_patchtokens.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"

 TEST(KernelDescriptorFromPatchtokens, GivenEmptyInputKernelFromPatchtokensThenOnlySetsUpPointerSizeAndBinaryType) {
    NEO::PatchTokenBinary::KernelFromPatchtokens kernelTokens;
--- a/shared/test/unit_test/kernel/kernel_raytracing_tests.cpp
+++ b/shared/test/unit_test/kernel/kernel_raytracing_tests.cpp
@@ -8,8 +8,8 @@
 #include "shared/source/device_binary_format/patchtokens_decoder.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/kernel/kernel_descriptor_from_patchtokens.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"

 TEST(KernelDescriptorFromPatchtokens, GivenKernelWithRTDispatchGlobalsThenKernelDescriptorIsProperlyPopulated) {
    std::vector<uint8_t> storage;
--- a/shared/test/unit_test/program/program_info_from_patchtokens_tests.cpp
+++ b/shared/test/unit_test/program/program_info_from_patchtokens_tests.cpp
@@ -10,8 +10,8 @@
 #include "shared/source/program/kernel_info.h"
 #include "shared/source/program/program_info.h"
 #include "shared/source/program/program_info_from_patchtokens.h"
-#include "shared/test/unit_test/compiler_interface/linker_mock.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"
+#include "shared/test/common/compiler_interface/linker_mock.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"

 #include "RelocationInfo.h"
 #include "gtest/gtest.h"
--- a/shared/test/unit_test/program/program_initialization_tests.cpp
+++ b/shared/test/unit_test/program/program_initialization_tests.cpp
@@ -7,12 +7,12 @@

 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/program/program_initialization.h"
+#include "shared/test/common/compiler_interface/linker_mock.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
-#include "shared/test/unit_test/compiler_interface/linker_mock.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp
+++ b/shared/test/unit_test/xe_hpc_core/pvc/device_binary_format_ar_tests_pvc.cpp
@@ -15,10 +15,10 @@
 #include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"

 #include "platforms.h"

--- a/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/device_binary_format_ar_tests_dg2.cpp
@@ -15,10 +15,10 @@
 #include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
+#include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"

 #include "platforms.h"