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>

opencl/test/unit_test/api/cl_create_pipe_tests.inl

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/device/device.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/context/context.h"
 #include "opencl/source/helpers/base_object.h"

opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "shared/source/device/device.h"
 #include "shared/test/common/mocks/mock_device.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"

opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp

@@ -12,7 +12,7 @@
 #include "shared/test/common/cmd_parse/hw_parse.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 "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/api/api.h"

opencl/test/unit_test/api/cl_svm_alloc_tests.inl

@@ -7,7 +7,7 @@
 
 #include "shared/source/device/device.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"

opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 #include "shared/test/unit_test/tests_configuration.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
 
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h"

opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h

@@ -15,7 +15,7 @@
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_device.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/cl_device/cl_device.h"

opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp

@@ -8,7 +8,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.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/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/api/api.h"
 #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h"

opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/api/api.h"
 #include "opencl/source/platform/platform.h"

opencl/test/unit_test/built_ins/built_in_tests.cpp

@@ -24,7 +24,7 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/ult_device_factory.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 "opencl/source/built_ins/aux_translation_builtin.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"

opencl/test/unit_test/command_queue/blit_enqueue_1_tests.cpp

@@ -18,7 +18,7 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp

@@ -18,7 +18,7 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/test/unit_test/command_queue/blit_enqueue_fixture.h

@@ -19,7 +19,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp

@@ -13,7 +13,7 @@
 #include "shared/test/common/mocks/mock_csr.h"
 #include "shared/test/common/mocks/mock_os_library.h"
 #include "shared/test/common/mocks/mock_source_level_debugger.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"

opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp

@@ -8,7 +8,7 @@
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/mocks/mock_builtins.h"
 #include "shared/test/common/mocks/mock_csr.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/helpers/dispatch_info_builder.h"

opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp

@@ -10,7 +10,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"

opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp

@@ -18,7 +18,7 @@
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/helpers/cl_hw_helper.h"

opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp

@@ -14,7 +14,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_csr.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"

opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/helpers/compiler_hw_info_config.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 "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/event/event.h"

opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp

@@ -14,7 +14,7 @@
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/mocks/mock_execution_environment.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 "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/helpers/dispatch_info.h"

opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp

@@ -18,8 +18,8 @@
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/test_macros/test.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
 
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"

opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/helpers/compiler_hw_info_config.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 "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/event/event.h"

opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp

@@ -12,7 +12,7 @@
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/mocks/mock_execution_environment.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 "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/helpers/dispatch_info.h"

opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp

@@ -23,7 +23,7 @@
 #include "shared/test/common/mocks/mock_timestamp_container.h"
 #include "shared/test/common/mocks/ult_device_factory.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 "opencl/source/event/user_event.h"
 #include "opencl/source/helpers/cl_blit_properties.h"

opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp

@@ -18,7 +18,7 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_timestamp_container.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 "opencl/source/event/user_event.h"
 #include "opencl/source/helpers/cl_blit_properties.h"

opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp

@@ -27,7 +27,7 @@
 #include "shared/test/common/mocks/mock_timestamp_container.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/resource_barrier.h"

opencl/test/unit_test/context/context_multi_device_tests.cpp

@@ -10,7 +10,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/variable_backup.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 "opencl/source/context/context.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"

opencl/test/unit_test/event/async_events_handler_tests.cpp

@@ -10,7 +10,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/mock_method_macros.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 "opencl/source/event/async_events_handler.h"
 #include "opencl/source/event/event.h"

opencl/test/unit_test/event/event_fixture.h

@@ -10,7 +10,7 @@
 #include "shared/source/command_stream/wait_status.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/ptr_math.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/event/user_event.h"

opencl/test/unit_test/execution_environment/execution_environment_tests.cpp

@@ -25,7 +25,7 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/utilities/destructor_counted.h"
+#include "shared/test/common/utilities/destructor_counted.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_async_event_handler.h"

opencl/test/unit_test/gen12lp/buffer_tests_gen12lp.inl

@@ -10,7 +10,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/test/unit_test/gen12lp/dg1/execution_environment_tests_dg1.cpp

@@ -9,7 +9,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/destructor_counted.h"
+#include "shared/test/common/utilities/destructor_counted.h"
 
 namespace NEO {
 

opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp

@@ -18,7 +18,7 @@
 #include "shared/test/common/mocks/mock_allocation_properties.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/api/api.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"

opencl/test/unit_test/helpers/test_preamble_dg2_and_later.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/debug_settings/debug_settings_manager.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/common/test_macros/test.h"
-#include "shared/test/unit_test/preamble/preamble_fixture.h"
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
 

opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp

@@ -9,8 +9,8 @@
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/state_base_address.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 "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp

@@ -15,7 +15,7 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/command_queue/hardware_interface.h"

opencl/test/unit_test/helpers/timestamp_packet_2_tests.cpp

@@ -9,7 +9,7 @@
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/helpers/timestamp_packet_tests.h"

opencl/test/unit_test/kernel/clone_kernel_tests.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/memory_manager/unified_memory_manager.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 "opencl/source/accelerators/intel_accelerator.h"
 #include "opencl/source/accelerators/intel_motion_estimation.h"

opencl/test/unit_test/kernel/kernel_tests.cpp

@@ -26,8 +26,8 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
 #include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
 
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/helpers/cl_hw_helper.h"

opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp

@@ -16,7 +16,7 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_timestamp_container.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/api/api.h"
 #include "opencl/source/event/user_event.h"

opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp

@@ -10,7 +10,7 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/cl_device/cl_device.h"

opencl/test/unit_test/mem_obj/image_compression_fixture.h

@@ -10,7 +10,7 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/helpers/surface_formats.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"

opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/helpers/cl_hw_helper.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"

opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp

@@ -10,7 +10,7 @@
 #include "shared/test/common/fixtures/mock_execution_environment_gmm_fixture.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/logger_tests.h"
+#include "shared/test/common/utilities/logger_tests.h"
 
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h"
 

opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp

@@ -29,7 +29,7 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_os_context.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/test/unit_test/profiling/profiling_tests.cpp

@@ -12,7 +12,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_timestamp_container.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 "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/enqueue_common.h"

opencl/test/unit_test/program/program_tests.cpp

@@ -37,7 +37,7 @@
 #include "shared/test/common/mocks/mock_compiler_interface.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/gtpin/gtpin_notify.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"

opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/fixtures/scenario_test_fixture.h"

opencl/test/unit_test/utilities/file_logger_tests.cpp

@@ -9,8 +9,8 @@
 
 #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 "shared/test/unit_test/utilities/logger_tests.h"
+#include "shared/test/common/utilities/logger_tests.h"
 
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"

opencl/test/unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp

@@ -16,7 +16,7 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"

opencl/test/unit_test/xe_hp_core/xehp/cache_flush_tests_xehp.inl

@@ -7,7 +7,7 @@
 
 #include "shared/test/common/mocks/mock_allocation_properties.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 "opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"

opencl/test/unit_test/xe_hp_core/xehp/test_preamble_xehp.cpp

@@ -7,9 +7,9 @@
 
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/test/common/fixtures/preamble_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/preamble/preamble_fixture.h"
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
 

opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp

@@ -16,7 +16,7 @@
 #include "shared/test/common/mocks/mock_graphics_allocation.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/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp

@@ -19,7 +19,7 @@
 #include "shared/test/common/libult/ult_aub_command_stream_receiver.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/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp

@@ -17,7 +17,7 @@
 #include "shared/test/common/mocks/mock_graphics_allocation.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/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"

opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/utilities/base_object_utils.h"
+#include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/sampler/sampler.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"

opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/state_base_address.h"
+#include "shared/test/common/fixtures/preamble_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/preamble/preamble_fixture.h"
 
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"

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()

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
+target_sources(neo_libult_common PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
-               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-)
 
-add_subdirectories()
+add_subdirectories()

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()

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})

shared/test/common/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
 #

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
+)

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>

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;
 

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"
 

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"
 

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;
 

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/common/source_level_debugger/source_level_debugger_preamble_test.h"
-#include "shared/test/unit_test/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;
 

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;
 

shared/test/unit_test/os_interface/CMakeLists.txt

@@ -4,34 +4,19 @@
 # SPDX-License-Identifier: MIT
 #
 
-set(NEO_CORE_OS_INTERFACE_AUB_TESTS
+target_sources(neo_shared_tests PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${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.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler_tests.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler_tests.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_context_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/device_uuid_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_library_tests.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_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
-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
 )
 
 if(WIN32 OR(UNIX AND NOT DISABLE_WDDM_LINUX))
-  list(APPEND NEO_CORE_OS_INTERFACE_TESTS
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_logging_tests.cpp)
-       ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_logging_tests.cpp
-  )
 endif()
 
-set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_TESTS ${NEO_CORE_OS_INTERFACE_TESTS})
+add_subdirectories()
-
-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()

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
+  target_sources(neo_shared_tests PRIVATE ${NEO_CORE_OS_INTERFACE_TESTS_LINUX})
-                 ${NEO_CORE_OS_INTERFACE_TESTS_LINUX}
-  )
 endif()
-add_subdirectories()
+
+add_subdirectories()

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;
 

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
+  target_sources(neo_shared_tests PRIVATE
-                 ${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
   )
-endif()
+endif()

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
+  target_sources(neo_shared_tests PRIVATE
-                 ${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
   )
 endif()
 
-add_subdirectories()
+add_subdirectories()

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
+  list(APPEND NEO_CORE_PREAMBLE_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpg_core.cpp)
-       ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpg_core.cpp
-  )
 endif()
 
-target_sources(${TARGET_NAME} PRIVATE ${NEO_CORE_PREAMBLE_TESTS})
+target_sources(neo_shared_tests PRIVATE ${NEO_CORE_PREAMBLE_TESTS})
-add_subdirectories()
+
+add_subdirectories()

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
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xehp_and_later.cpp)
-                 ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xehp_and_later.cpp
-  )
 endif()
 
-add_subdirectories()
+add_subdirectories()

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
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controler_xehp_and_later_tests.cpp)
-                 ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controler_xehp_and_later_tests.cpp
-  )
 endif()
 
-add_subdirectories()
+add_subdirectories()

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
-)
+)

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()

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()

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
+  target_sources(neo_shared_tests PRIVATE
-                 ${UTILITIES_CPUINFO_TESTS_LINUX}
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_linux.cpp
   )
-endif()
+endif()

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"
 

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
+  target_sources(neo_shared_tests PRIVATE
-                 ${UTILITIES_CPUINFO_TESTS_WINDOWS}
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_windows.cpp
   )
-endif()
+endif()

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()

shared/test/unit_test/utilities/x86_64/linux/CMakeLists.txt

@@ -5,7 +5,5 @@
 #
 
 if(UNIX)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_x86_64_linux.cpp)
-                 ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests_x86_64_linux.cpp
+endif()
-  )
-endif()

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;
 

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;