diff --git a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h index 4bacf5de66..12b7f1597c 100644 --- a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h @@ -11,7 +11,6 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h b/level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h index e130881b7e..904a14adca 100644 --- a/level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/memory_ipc_fixture.h @@ -17,7 +17,6 @@ #include "shared/test/common/mocks/mock_device.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 "level_zero/core/source/cmdlist/cmdlist_hw.h" #include "level_zero/core/source/context/context_imp.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h b/level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h index dba1b9bfe2..edef43588c 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h @@ -7,7 +7,6 @@ #pragma once #include "shared/source/os_interface/device_factory.h" -#include "shared/test/common/test_macros/test.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/firmware_util/mock_fw_util_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/firmware_util/mock_fw_util_fixture.h index 498a60dcec..e85d847661 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/firmware_util/mock_fw_util_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/firmware_util/mock_fw_util_fixture.h @@ -8,7 +8,6 @@ #pragma once #include "shared/test/common/test_macros/mock_method_macros.h" -#include "shared/test/common/test_macros/test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/sysman/firmware_util/firmware_util.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h index 5b6cd0d605..9f0c75c7e2 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysfs_access_fixture.h @@ -7,8 +7,6 @@ #pragma once -#include "shared/test/common/test_macros/test.h" - #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/sysman/sysman.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h index 05a98c379f..8e80d3dcf7 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h @@ -11,7 +11,6 @@ #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/os_interface.h" -#include "shared/test/common/test_macros/test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/sysman/sysman.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_device_info.h b/level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_device_info.h index bfd743fd0e..549303372a 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_device_info.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_device_info.h @@ -8,7 +8,6 @@ #pragma once #include "shared/test/common/mocks/ult_device_factory.h" -#include "shared/test/common/test_macros/test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/sysman/sysman_imp.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_env_vars.h b/level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_env_vars.h index 2fae90b931..a02f3e4632 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_env_vars.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/mocks/mock_sysman_env_vars.h @@ -9,7 +9,6 @@ #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_io_functions.h" -#include "shared/test/common/test_macros/test.h" extern bool sysmanUltsEnable; diff --git a/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h b/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h index 7d7c447333..669f02f10a 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h +++ b/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h @@ -14,7 +14,6 @@ #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/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/extensions/public/cl_ext_private.h" diff --git a/opencl/test/unit_test/command_queue/blit_enqueue_fixture.h b/opencl/test/unit_test/command_queue/blit_enqueue_fixture.h index e9b2830f04..73d141c3bc 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_fixture.h +++ b/opencl/test/unit_test/command_queue/blit_enqueue_fixture.h @@ -18,7 +18,6 @@ #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/common/test_macros/test.h" #include "shared/test/unit_test/compiler_interface/linker_mock.h" #include "shared/test/unit_test/utilities/base_object_utils.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h index 37d2301d7c..f009bf2f70 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h @@ -1,12 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" diff --git a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h index 047fb58873..87731a40e4 100644 --- a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h +++ b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,6 @@ #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/helpers/cl_execution_environment_helper.h" diff --git a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h index cf7a35b400..abb05e0bd9 100644 --- a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h +++ b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,6 @@ #pragma once #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" diff --git a/opencl/test/unit_test/fixtures/kernel_work_group_info_fixture.h b/opencl/test/unit_test/fixtures/kernel_work_group_info_fixture.h index 56960b3f4c..da5353952d 100644 --- a/opencl/test/unit_test/fixtures/kernel_work_group_info_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_work_group_info_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,6 @@ #include "shared/source/helpers/file_io.h" #include "shared/test/common/helpers/kernel_binary_helper.h" #include "shared/test/common/helpers/test_files.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/api/cl_api_tests.h" diff --git a/opencl/test/unit_test/fixtures/multi_tile_fixture.h b/opencl/test/unit_test/fixtures/multi_tile_fixture.h index d04903bac9..c521222503 100644 --- a/opencl/test/unit_test/fixtures/multi_tile_fixture.h +++ b/opencl/test/unit_test/fixtures/multi_tile_fixture.h @@ -12,7 +12,6 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/variable_backup.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h b/opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h index 1e15415017..d5bb6c1302 100644 --- a/opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h +++ b/opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h @@ -7,8 +7,6 @@ #pragma once -#include "shared/test/common/test_macros/test.h" - #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/fixtures/scenario_test_fixture.h b/opencl/test/unit_test/fixtures/scenario_test_fixture.h index 9e85c64599..30d5a78213 100644 --- a/opencl/test/unit_test/fixtures/scenario_test_fixture.h +++ b/opencl/test/unit_test/fixtures/scenario_test_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,6 @@ #pragma once #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h index ed39e36453..296be623f9 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h @@ -10,7 +10,6 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/command_container/command_encoder.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h index 55f21677f4..1a0c1164d5 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h @@ -6,7 +6,6 @@ */ #pragma once -#include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h b/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h index ddd92f6252..aef61f7a72 100644 --- a/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h +++ b/opencl/test/unit_test/offline_compiler/ocloc_product_config_tests.h @@ -7,8 +7,6 @@ #pragma once -#include "shared/test/common/test_macros/test.h" - #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h" namespace NEO { diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.h b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.h index 5a109c6f6f..00b03c0b9b 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.h +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.h @@ -14,7 +14,6 @@ #include "shared/test/common/mocks/mock_os_library.h" #include "shared/test/common/mocks/mock_sip.h" #include "shared/test/common/mocks/mock_source_level_debugger.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/shared/test/common/fixtures/front_window_fixture.h b/shared/test/common/fixtures/front_window_fixture.h index c1a9d222d6..54f12b0be4 100644 --- a/shared/test/common/fixtures/front_window_fixture.h +++ b/shared/test/common/fixtures/front_window_fixture.h @@ -9,7 +9,6 @@ #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/test_macros/test.h" namespace NEO { diff --git a/shared/test/common/fixtures/implicit_scaling_fixture.h b/shared/test/common/fixtures/implicit_scaling_fixture.h index a9d01af823..24af82ec55 100644 --- a/shared/test/common/fixtures/implicit_scaling_fixture.h +++ b/shared/test/common/fixtures/implicit_scaling_fixture.h @@ -13,7 +13,6 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/test_macros/test.h" #include diff --git a/shared/test/unit_test/os_interface/linux/device_factory_tests_linux.h b/shared/test/unit_test/os_interface/linux/device_factory_tests_linux.h index 460df345d8..cd3720bd39 100644 --- a/shared/test/unit_test/os_interface/linux/device_factory_tests_linux.h +++ b/shared/test/unit_test/os_interface/linux/device_factory_tests_linux.h @@ -10,7 +10,6 @@ #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 "shared/test/common/test_macros/test.h" namespace NEO { extern Drm **pDrmToReturnFromCreateFunc; diff --git a/shared/test/unit_test/preamble/preamble_fixture.h b/shared/test/unit_test/preamble/preamble_fixture.h index 056c992fb6..b1be613853 100644 --- a/shared/test/unit_test/preamble/preamble_fixture.h +++ b/shared/test/unit_test/preamble/preamble_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,6 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/fixtures/linear_stream_fixture.h" -#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/shared/test/unit_test/utilities/destructor_counted.h b/shared/test/unit_test/utilities/destructor_counted.h index 842ab8cc4f..0d00009690 100644 --- a/shared/test/unit_test/utilities/destructor_counted.h +++ b/shared/test/unit_test/utilities/destructor_counted.h @@ -1,12 +1,11 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "shared/test/common/test_macros/test.h" namespace NEO {