Use full path to include test.h 1/n

fix files in opencl

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

opencl/test/unit_test/os_interface/device_factory_tests.cpp

@@ -17,10 +17,10 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #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 "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
-#include "test.h"
 
 #include "hw_device_id.h"
 

opencl/test/unit_test/os_interface/hw_info_config_tests.h

@@ -8,9 +8,9 @@
 #pragma once
 
 #include "shared/source/device/device.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/test/unit_test/fixtures/platform_fixture.h"
-#include "test.h"
 
 #include "gtest/gtest.h"
 

opencl/test/unit_test/os_interface/linux/debug_env_reader.cpp

@@ -9,8 +9,7 @@
 
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include <memory>
 #include <unordered_map>

opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp

@@ -15,11 +15,11 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
+#include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"
 
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
-#include "test.h"
 
 #include "gtest/gtest.h"
 

opencl/test/unit_test/os_interface/linux/device_factory_tests.h

@@ -13,8 +13,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "gtest/gtest.h"
 

opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp

@@ -17,8 +17,7 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_gmm_helper.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "drm/i915_drm.h"
 

opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h

@@ -16,9 +16,9 @@
 #include "shared/test/common/mocks/linux/mock_drm_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
-#include "test.h"
 
 #include "gmock/gmock.h"
 

opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp

@@ -14,9 +14,9 @@
 #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/platform/platform.h"
-#include "test.h"
 
 using namespace NEO;
 

opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp

@@ -30,6 +30,7 @@
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 #include "shared/test/common/mocks/mock_host_ptr_manager.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
@@ -38,7 +39,6 @@
 #include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h"
 #include "opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h"
-#include "test.h"
 
 #include "drm/i915_drm.h"
 #include "gmock/gmock.h"

opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp

@@ -28,6 +28,7 @@
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 #include "shared/test/common/mocks/mock_host_ptr_manager.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/mem_obj/buffer.h"
@@ -37,7 +38,6 @@
 #include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h"
 #include "opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h"
-#include "test.h"
 
 #include "drm/i915_drm.h"
 

opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp

@@ -16,9 +16,9 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/mem_obj/buffer.h"
-#include "test.h"
 
 #include "drm/i915_drm.h"
 #include "gmock/gmock.h"

opencl/test/unit_test/os_interface/linux/drm_mapper_tests.cpp

@@ -6,8 +6,7 @@
  */
 
 #include "shared/source/os_interface/linux/drm_engine_mapper.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "drm/i915_drm.h"
 

opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp

@@ -10,9 +10,9 @@
 #include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/test/unit_test/os_interface/linux/drm_mock_impl.h"
-#include "test.h"
 
 #include "gtest/gtest.h"
 

opencl/test/unit_test/os_interface/linux/drm_memory_manager_localmem_tests.cpp

@@ -16,13 +16,13 @@
 #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_gmm.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests_impl.h"
 #include "opencl/test/unit_test/os_interface/linux/drm_mock_impl.h"
 #include "opencl/test/unit_test/os_interface/linux/drm_mock_memory_info.h"
-#include "test.h"
 
 #include "gtest/gtest.h"
 

opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp

@@ -36,6 +36,7 @@
 #include "shared/test/common/mocks/mock_gfx_partition.h"
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/test_macros/matchers.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/event/event.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
@@ -45,7 +46,6 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "opencl/test/unit_test/os_interface/linux/drm_mock_cache_info.h"
-#include "test.h"
 
 #include "drm/i915_drm.h"
 #include "gmock/gmock.h"

opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp

@@ -7,8 +7,7 @@
 
 #include "shared/source/os_interface/linux/drm_memory_operations_handler_default.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include <memory>
 

opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp

@@ -6,13 +6,13 @@
  */
 
 #include "shared/test/common/os_interface/linux/drm_memory_manager_tests.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sharings/va/va_surface.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/sharings/va/mock_va_sharing.h"
-#include "test.h"
 
 namespace NEO {
 

opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #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 "opencl/test/unit_test/utilities/file_logger_tests.h"
-#include "test.h"
 
 using namespace NEO;
 

opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp

@@ -9,10 +9,10 @@
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/test/unit_test/os_interface/linux/drm_mock_impl.h"
 #include "opencl/test/unit_test/os_interface/linux/drm_mock_prod_dg1.h"
-#include "test.h"
 
 using namespace NEO;
 

opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp

@@ -10,8 +10,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 using namespace NEO;
 

opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp

@@ -9,9 +9,9 @@
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/test/unit_test/os_interface/linux/drm_mock_impl.h"
-#include "test.h"
 
 using namespace NEO;
 

opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp

@@ -10,11 +10,11 @@
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/linux/mock_drm_command_stream_receiver.h"
 #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
-#include "test.h"
 
 using namespace NEO;
 

opencl/test/unit_test/os_interface/linux/os_time_test.cpp

@@ -10,9 +10,9 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h"
-#include "test.h"
 
 #include "gtest/gtest.h"
 

opencl/test/unit_test/os_interface/linux/prelim_helper_func.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "third_party/uapi/prelim/drm/i915_drm.h"
 

opencl/test/unit_test/os_interface/os_library_tests.cpp

@@ -12,8 +12,7 @@
 #endif
 #include "shared/source/os_interface/os_library.h"
 #include "shared/test/common/fixtures/memory_management_fixture.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "gtest/gtest.h"
 

opencl/test/unit_test/os_interface/performance_counters_gen_tests.cpp

@@ -6,8 +6,7 @@
  */
 
 #include "shared/source/os_interface/performance_counters.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 using namespace NEO;
 

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

@@ -36,6 +36,7 @@
 #include "shared/test/common/mocks/windows/mock_wddm_direct_submission.h"
 #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h"
 #include "shared/test/common/os_interface/windows/wddm_fixture.h"
+#include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h"
 
@@ -48,7 +49,6 @@
 #include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h"
 #include "opencl/test/unit_test/mocks/mock_wddm_interface23.h"
-#include "test.h"
 
 #include "hw_cmds.h"
 

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

@@ -9,10 +9,10 @@
 #include "shared/source/gmm_helper/gmm.h"
 #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/test.h"
 
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h"
 #include "opencl/test/unit_test/utilities/file_logger_tests.h"
-#include "test.h"
 
 using namespace NEO;
 

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

@@ -14,8 +14,7 @@
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 namespace NEO {
 

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

@@ -7,8 +7,7 @@
 
 #include "shared/source/os_interface/windows/os_library_win.h"
 #include "shared/test/common/helpers/variable_backup.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "gtest/gtest.h"
 

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

@@ -9,8 +9,7 @@
 
 #include "shared/source/os_interface/windows/sys_calls.h"
 #include "shared/test/common/helpers/variable_backup.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 namespace NEO {
 

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

@@ -17,11 +17,11 @@
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/mocks/mock_wddm.h"
 #include "shared/test/common/os_interface/windows/gdi_dll_fixture.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "opencl/test/unit_test/mocks/mock_wddm_interface23.h"
-#include "test.h"
 
 using namespace NEO;
 

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

@@ -9,8 +9,7 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_wddm.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 using namespace NEO;
 

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

@@ -14,13 +14,13 @@
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 #include "shared/source/os_interface/windows/wddm_allocation.h"
 #include "shared/test/common/mock_gdi/mock_gdi.h"
+#include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h"
 
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h"
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h"
-#include "test.h"
 
 using namespace NEO;
 

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

@@ -6,8 +6,7 @@
  */
 
 #include "shared/source/os_interface/windows/wddm_engine_mapper.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 using namespace NEO;
 

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

@@ -16,12 +16,12 @@
 #include "shared/test/common/mocks/mock_wddm_residency_allocations_container.h"
 #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h"
 #include "shared/test/common/os_interface/windows/wddm_fixture.h"
+#include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h"
 
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
-#include "test.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

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

@@ -23,12 +23,12 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_wddm.h"
 #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h"
+#include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h"
 
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h"
-#include "test.h"
 
 #include "gmock/gmock.h"
 

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

@@ -14,13 +14,13 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_wddm.h"
 #include "shared/test/common/os_interface/windows/wddm_fixture.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/mem_obj/mem_obj.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h"
-#include "test.h"
 
 using namespace NEO;