diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt index 9145290d12..5f2b385b41 100644 --- a/level_zero/core/test/aub_tests/CMakeLists.txt +++ b/level_zero/core/test/aub_tests/CMakeLists.txt @@ -85,7 +85,6 @@ target_sources(${TARGET_NAME} PRIVATE ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}kernel_binary_helper_hash_value.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_memory_manager.cpp diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt index 2dcd559dba..d9211e4d68 100644 --- a/level_zero/core/test/unit_tests/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/CMakeLists.txt @@ -23,7 +23,6 @@ add_executable(${TARGET_NAME} ${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.h - ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp ${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp ) @@ -42,7 +41,6 @@ target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp $ $ ) diff --git a/level_zero/core/test/unit_tests/main.cpp b/level_zero/core/test/unit_tests/main.cpp index 63ef3adb9d..75db5be265 100644 --- a/level_zero/core/test/unit_tests/main.cpp +++ b/level_zero/core/test/unit_tests/main.cpp @@ -10,18 +10,18 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/utilities/debug_settings_reader.h" +#include "shared/test/common/helpers/custom_event_listener.h" #include "shared/test/common/helpers/default_hw_info.inl" #include "shared/test/common/helpers/memory_leak_listener.h" #include "shared/test/common/helpers/test_files.h" #include "shared/test/common/helpers/ult_hw_config.inl" +#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_gmm_client_context.h" #include "shared/test/common/mocks/mock_sip.h" #include "shared/test/unit_test/base_ult_config_listener.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/utilities/logger.h" -#include "opencl/test/unit_test/custom_event_listener.h" -#include "opencl/test/unit_test/global_environment.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/compiler_interface/l0_reg_path.h" diff --git a/level_zero/core/test/unit_tests/mocks/mock_device_for_spirv.cpp b/level_zero/core/test/unit_tests/mocks/mock_device_for_spirv.cpp index 21b1b92dfc..9ec142d867 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_device_for_spirv.cpp +++ b/level_zero/core/test/unit_tests/mocks/mock_device_for_spirv.cpp @@ -9,8 +9,8 @@ #include "shared/source/helpers/file_io.h" #include "shared/test/common/helpers/test_files.h" +#include "shared/test/common/libult/global_environment.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "level_zero/tools/source/debug/debug_session.h" diff --git a/level_zero/experimental/test/unit_tests/CMakeLists.txt b/level_zero/experimental/test/unit_tests/CMakeLists.txt index c7e0d6b864..34b45e094f 100644 --- a/level_zero/experimental/test/unit_tests/CMakeLists.txt +++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt @@ -27,7 +27,6 @@ add_executable( ${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.cpp ${NEO_SOURCE_DIR}/shared/test/common/mocks/ult_device_factory.h - ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests/sources/builtin/create_ult_builtin_functions_lib.cpp ${NEO_SOURCE_DIR}/level_zero/tools/test/unit_tests/sources/debug/debug_session_helper.cpp @@ -50,7 +49,6 @@ target_sources( PRIVATE ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp $ $ ) diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt index 2770c7f777..372056dfd6 100644 --- a/level_zero/tools/test/unit_tests/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/CMakeLists.txt @@ -40,7 +40,6 @@ target_sources(${TARGET_NAME} PRIVATE ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}kernel_binary_helper_hash_value.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp $ $ ) diff --git a/opencl/test/unit_test/api/cl_link_program_tests.inl b/opencl/test/unit_test/api/cl_link_program_tests.inl index a0501668aa..3fc24a5398 100644 --- a/opencl/test/unit_test/api/cl_link_program_tests.inl +++ b/opencl/test/unit_test/api/cl_link_program_tests.inl @@ -9,9 +9,9 @@ #include "shared/source/device_binary_format/elf/elf_decoder.h" #include "shared/source/helpers/file_io.h" #include "shared/test/common/helpers/test_files.h" +#include "shared/test/common/libult/global_environment.h" #include "opencl/source/context/context.h" -#include "opencl/test/unit_test/global_environment.h" #include "cl_api_tests.h" #include "compiler_options.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h index 0939ecacb6..6f91c3e3ad 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h @@ -10,6 +10,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/file_io.h" #include "shared/test/common/helpers/test_files.h" +#include "shared/test/common/libult/global_environment.h" #include "opencl/source/program/program.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" #include "opencl/test/unit_test/fixtures/run_kernel_fixture.h" -#include "opencl/test/unit_test/global_environment.h" namespace NEO { diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index b1860986a7..183941453f 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -13,6 +13,7 @@ #include "shared/source/helpers/hash.h" #include "shared/source/helpers/string.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_compiler_interface.h" #include "shared/test/common/mocks/mock_compilers.h" #include "shared/test/unit_test/utilities/base_object_utils.h" @@ -29,7 +30,6 @@ #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/fixtures/run_kernel_fixture.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/built_ins/sip_tests.cpp b/opencl/test/unit_test/built_ins/sip_tests.cpp index c3d21bd6cb..99614248c6 100644 --- a/opencl/test/unit_test/built_ins/sip_tests.cpp +++ b/opencl/test/unit_test/built_ins/sip_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/built_ins/sip.h" #include "shared/test/common/helpers/test_files.h" +#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_device.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" diff --git a/opencl/test/unit_test/fixtures/built_in_fixture.cpp b/opencl/test/unit_test/fixtures/built_in_fixture.cpp index 1d2f43d86a..84047d0aa3 100644 --- a/opencl/test/unit_test/fixtures/built_in_fixture.cpp +++ b/opencl/test/unit_test/fixtures/built_in_fixture.cpp @@ -10,9 +10,9 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/device/device.h" #include "shared/test/common/helpers/test_files.h" +#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/test_macros/test_checks_shared.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/run_kernel_fixture.h b/opencl/test/unit_test/fixtures/run_kernel_fixture.h index 8aaa5e968d..107a78399e 100644 --- a/opencl/test/unit_test/fixtures/run_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/run_kernel_fixture.h @@ -8,8 +8,7 @@ #pragma once #include "shared/test/common/helpers/test_files.h" - -#include "opencl/test/unit_test/global_environment.h" +#include "shared/test/common/libult/global_environment.h" namespace NEO { struct CommandQueueHwFixture; diff --git a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp index daa35c834f..a1f9b1b2b2 100644 --- a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp @@ -8,9 +8,9 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/built_ins/sip.h" #include "shared/test/common/helpers/test_files.h" +#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_device.h" -#include "opencl/test/unit_test/global_environment.h" #include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/kernel_binary_helper.cpp b/opencl/test/unit_test/helpers/kernel_binary_helper.cpp index b9fa3ad5f8..979d2a579a 100644 --- a/opencl/test/unit_test/helpers/kernel_binary_helper.cpp +++ b/opencl/test/unit_test/helpers/kernel_binary_helper.cpp @@ -8,8 +8,7 @@ #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "shared/test/common/helpers/test_files.h" - -#include "opencl/test/unit_test/global_environment.h" +#include "shared/test/common/libult/global_environment.h" #include diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index 7a3ae4d6d0..9a0f7fe9d0 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -47,9 +47,7 @@ add_library(igdrcl_libult_cs OBJECT EXCLUDE_FROM_ALL ) set(IGDRCL_SRCS_LIB_ULT_ENV - ${NEO_SOURCE_DIR}/opencl/test/unit_test/custom_event_listener.h - ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.h + ${NEO_SOURCE_DIR}/shared/test/common/helpers/custom_event_listener.h ${NEO_SOURCE_DIR}/opencl/test/unit_test/main.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/options_unit_tests.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/command_queue_fixture.cpp diff --git a/opencl/test/unit_test/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp index 3540b94caf..421df046a2 100644 --- a/opencl/test/unit_test/linux/main_linux_dll.cpp +++ b/opencl/test/unit_test/linux/main_linux_dll.cpp @@ -13,13 +13,13 @@ #include "shared/source/os_interface/linux/allocator_helper.h" #include "shared/source/os_interface/linux/sys_calls.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/test/common/helpers/custom_event_listener.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.inl" #include "shared/test/common/helpers/ult_hw_config.inl" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_execution_environment.h" -#include "opencl/test/unit_test/custom_event_listener.h" #include "opencl/test/unit_test/linux/drm_wrap.h" #include "opencl/test/unit_test/linux/mock_os_layer.h" #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" @@ -40,6 +40,11 @@ namespace NEO { void __attribute__((destructor)) platformsDestructor(); extern const DeviceDescriptor deviceDescriptorTable[]; } // namespace NEO + +NEO::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo, uint64_t gpuAddressSpace) { + return nullptr; +} + using namespace NEO; class DrmTestsFixture { diff --git a/opencl/test/unit_test/main.cpp b/opencl/test/unit_test/main.cpp index a16d926819..05159aabea 100644 --- a/opencl/test/unit_test/main.cpp +++ b/opencl/test/unit_test/main.cpp @@ -11,17 +11,17 @@ #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/utilities/debug_settings_reader.h" +#include "shared/test/common/helpers/custom_event_listener.h" #include "shared/test/common/helpers/default_hw_info.inl" #include "shared/test/common/helpers/memory_leak_listener.h" #include "shared/test/common/helpers/test_files.h" #include "shared/test/common/helpers/ult_hw_config.inl" +#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_sip.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "shared/test/unit_test/tests_configuration.h" #include "opencl/source/os_interface/ocl_reg_path.h" -#include "opencl/test/unit_test/custom_event_listener.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/offline_compiler/main.cpp b/opencl/test/unit_test/offline_compiler/main.cpp index b68a7945d1..a24847044d 100644 --- a/opencl/test/unit_test/offline_compiler/main.cpp +++ b/opencl/test/unit_test/offline_compiler/main.cpp @@ -6,10 +6,9 @@ */ #include "shared/source/os_interface/os_library.h" +#include "shared/test/common/helpers/custom_event_listener.h" #include "shared/test/common/helpers/test_files.h" -#include "opencl/test/unit_test/custom_event_listener.h" - #include "environment.h" #include "limits.h" diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index aa2594f672..ec4abcf0b2 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -23,6 +23,7 @@ #include "shared/source/memory_manager/surface.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_compiler_interface.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" @@ -35,7 +36,6 @@ #include "opencl/source/program/create.inl" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" diff --git a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp index 57f42f5ec4..4843fe5ab0 100644 --- a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp +++ b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp @@ -6,9 +6,9 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/libult/global_environment.h" #include "opencl/test/unit_test/fixtures/program_fixture.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/helpers/kernel_filename_helper.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/custom_event_listener.h b/shared/test/common/helpers/custom_event_listener.h similarity index 100% rename from opencl/test/unit_test/custom_event_listener.h rename to shared/test/common/helpers/custom_event_listener.h diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index 8d8ed8cf90..c134b44471 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -63,6 +63,8 @@ set(igdrcl_libult_common_SRCS_LIB_ULT ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.h ${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/libult/global_environment.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/libult/global_environment.h ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.h ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_ult.cpp diff --git a/opencl/test/unit_test/global_environment.cpp b/shared/test/common/libult/global_environment.cpp similarity index 97% rename from opencl/test/unit_test/global_environment.cpp rename to shared/test/common/libult/global_environment.cpp index 80f86b5878..f6a97ff5bf 100644 --- a/opencl/test/unit_test/global_environment.cpp +++ b/shared/test/common/libult/global_environment.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/test/unit_test/global_environment.h" +#include "shared/test/common/libult/global_environment.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/os_inc_base.h" diff --git a/opencl/test/unit_test/global_environment.h b/shared/test/common/libult/global_environment.h similarity index 100% rename from opencl/test/unit_test/global_environment.h rename to shared/test/common/libult/global_environment.h diff --git a/shared/test/common/mocks/mock_compiler_interface_spirv.cpp b/shared/test/common/mocks/mock_compiler_interface_spirv.cpp index 77924105d1..a2a751b064 100644 --- a/shared/test/common/mocks/mock_compiler_interface_spirv.cpp +++ b/shared/test/common/mocks/mock_compiler_interface_spirv.cpp @@ -9,8 +9,8 @@ #include "shared/source/helpers/file_io.h" #include "shared/test/common/helpers/test_files.h" +#include "shared/test/common/libult/global_environment.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" namespace NEO { diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index 35e4c685f2..c84a668975 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -28,7 +28,6 @@ if(NOT SKIP_UNIT_TESTS) ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/io_functions.cpp diff --git a/shared/test/unit_test/compiler_interface/compiler_cache_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_cache_tests.cpp index 64f38c74e5..e6bf6f615b 100644 --- a/shared/test/unit_test/compiler_interface/compiler_cache_tests.cpp +++ b/shared/test/unit_test/compiler_interface/compiler_cache_tests.cpp @@ -11,9 +11,9 @@ #include "shared/source/helpers/hash.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/string.h" +#include "shared/test/common/libult/global_environment.h" #include "opencl/source/compiler_interface/default_cl_cache_config.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp index 922ae17693..a78dabd58e 100644 --- a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp +++ b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp @@ -12,12 +12,12 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/test_files.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_cif.h" #include "shared/test/common/mocks/mock_compiler_interface.h" #include "shared/test/common/mocks/mock_compilers.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/global_environment.h" #include "test.h" #include "gmock/gmock.h" diff --git a/shared/test/unit_test/main.cpp b/shared/test/unit_test/main.cpp index af0c1ceec2..0a0fe3716e 100644 --- a/shared/test/unit_test/main.cpp +++ b/shared/test/unit_test/main.cpp @@ -11,18 +11,18 @@ #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/utilities/debug_settings_reader.h" +#include "shared/test/common/helpers/custom_event_listener.h" #include "shared/test/common/helpers/default_hw_info.inl" #include "shared/test/common/helpers/memory_leak_listener.h" #include "shared/test/common/helpers/test_files.h" #include "shared/test/common/helpers/ult_hw_config.inl" +#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_gmm_client_context.h" #include "shared/test/common/mocks/mock_sip.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "shared/test/unit_test/tests_configuration.h" #include "opencl/source/os_interface/ocl_reg_path.h" -#include "opencl/test/unit_test/custom_event_listener.h" -#include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" #include "opencl/test/unit_test/mocks/mock_program.h"