From e4bbed49d07aea2e65d2976d0e911146e18db36a Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 14 Dec 2021 17:40:08 +0000 Subject: [PATCH] Use full path to include test.h 1/n fix files in opencl Signed-off-by: Mateusz Jablonski --- opencl/test/unit_test/accelerators/media_image_arg_tests.cpp | 2 +- opencl/test/unit_test/api/additional_extensions_tests.cpp | 3 ++- opencl/test/unit_test/api/cl_api_tests.h | 2 +- opencl/test/unit_test/api/cl_create_command_queue_tests.inl | 2 +- .../test/unit_test/api/cl_create_context_from_type_tests.inl | 3 ++- opencl/test/unit_test/api/cl_create_sub_devices_tests.inl | 2 +- opencl/test/unit_test/api/cl_enqueue_image_tests.inl | 3 ++- opencl/test/unit_test/api/cl_enqueue_verify_memory.inl | 2 +- opencl/test/unit_test/api/cl_get_device_ids_tests.inl | 2 +- .../unit_test/api/cl_get_device_info_pvc_and_later_tests.cpp | 3 ++- .../test/unit_test/api/cl_get_event_profiling_info_tests.inl | 3 ++- opencl/test/unit_test/api/cl_get_platform_info_tests.inl | 3 ++- .../test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl | 3 ++- .../unit_test/api/cl_mem_locally_uncached_resource_tests.cpp | 2 +- opencl/test/unit_test/api/cl_release_event_tests.inl | 3 ++- opencl/test/unit_test/api/cl_retain_release_device_tests.inl | 3 ++- .../api/cl_set_default_device_command_queue_tests.inl | 2 +- .../unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl | 2 +- opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl | 3 ++- opencl/test/unit_test/api/cl_unload_compiler_tests.inl | 2 +- opencl/test/unit_test/aub/aub_helper_tests.cpp | 2 +- opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp | 2 +- .../command_queue/enqueue_copy_buffer_aub_tests.cpp | 2 +- .../command_queue/enqueue_copy_buffer_rect_aub_tests.cpp | 2 +- .../aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp | 2 +- .../command_queue/enqueue_fill_buffer_aub_tests.cpp | 2 +- .../aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp | 2 +- .../aub_tests/command_queue/enqueue_kernel_aub_tests.cpp | 2 +- .../aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp | 3 ++- .../aub_tests/command_queue/enqueue_map_image_aub_tests.cpp | 2 +- .../command_queue/enqueue_printf_kernel_aub_tests.cpp | 3 ++- .../command_queue/enqueue_read_buffer_aub_tests.cpp | 2 +- .../command_queue/enqueue_read_buffer_rect_aub_tests.cpp | 2 +- .../aub_tests/command_queue/enqueue_read_image_aub_tests.cpp | 2 +- .../command_queue/enqueue_read_write_image_aub_fixture.h | 2 +- .../command_queue/enqueue_verify_memory_buffer_aub_tests.cpp | 2 +- .../command_queue/enqueue_verify_memory_image_aub_tests.cpp | 2 +- .../command_queue/enqueue_write_buffer_aub_tests.cpp | 2 +- .../command_queue/enqueue_write_buffer_rect_aub_tests.cpp | 2 +- .../enqueue_write_copy_read_buffer_aub_tests.cpp | 3 +-- .../command_queue/enqueue_write_image_aub_tests.cpp | 2 +- .../aub_tests/command_stream/aub_command_stream_tests.cpp | 2 +- .../unit_test/aub_tests/command_stream/aub_mem_dump_tests.h | 3 +-- .../aub_tests/command_stream/aub_mi_atomic_tests.cpp | 2 +- .../execution_model/enqueue_parent_kernel_tests_gen11.cpp | 2 +- .../gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp | 2 +- .../execution_model/enqueue_parent_kernel_tests_gen9.cpp | 2 +- .../unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp | 2 +- .../aub_tests/unified_memory/unified_memory_aub_tests.cpp | 5 +++-- .../unified_memory/unified_memory_copy_aub_tests.cpp | 5 +++-- opencl/test/unit_test/built_ins/built_in_tests.cpp | 2 +- opencl/test/unit_test/built_ins/built_in_tests_ocl.cpp | 3 +-- opencl/test/unit_test/built_ins/sip_tests.cpp | 2 +- opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp | 2 +- .../test/unit_test/command_queue/command_queue_hw_tests.cpp | 2 +- opencl/test/unit_test/command_queue/command_queue_tests.cpp | 2 +- .../command_queue/command_queue_tests_pvc_and_later.cpp | 2 +- .../unit_test/command_queue/csr_selection_args_tests.cpp | 3 ++- .../test/unit_test/command_queue/dispatch_walker_tests.cpp | 2 +- .../test/unit_test/command_queue/enqueue_barrier_tests.cpp | 2 +- .../command_queue/enqueue_command_without_kernel_tests.cpp | 2 +- .../enqueue_command_without_kernel_tests_dg2_and_later.cpp | 2 +- .../command_queue/enqueue_copy_buffer_rect_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_copy_buffer_tests.cpp | 2 +- .../command_queue/enqueue_copy_buffer_to_image_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_copy_image_tests.cpp | 2 +- .../command_queue/enqueue_copy_image_to_buffer_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_debug_kernel_tests.cpp | 2 +- .../command_queue/enqueue_fill_buffer_event_tests.cpp | 3 ++- .../unit_test/command_queue/enqueue_fill_buffer_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_fill_image_fixture.h | 2 +- .../unit_test/command_queue/enqueue_fill_image_tests.cpp | 2 +- .../test/unit_test/command_queue/enqueue_handler_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp | 3 ++- .../unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp | 2 +- .../command_queue/enqueue_kernel_two_walker_ioq_tests.cpp | 2 +- .../command_queue/enqueue_kernel_two_walker_ooq_tests.cpp | 3 ++- .../unit_test/command_queue/enqueue_map_buffer_tests.cpp | 2 +- .../test/unit_test/command_queue/enqueue_map_image_tests.cpp | 2 +- opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp | 2 +- opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp | 3 ++- .../command_queue/enqueue_media_kernel_xehp_and_later.cpp | 2 +- .../command_queue/enqueue_migrate_mem_objects_tests.cpp | 2 +- .../command_queue/enqueue_read_buffer_rect_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_read_buffer_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_read_image_tests.cpp | 2 +- .../command_queue/enqueue_resource_barier_tests.cpp | 3 ++- .../enqueue_resource_barier_tests_xehp_and_later.cpp | 2 +- .../unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp | 2 +- opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp | 2 +- opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp | 2 +- .../command_queue/enqueue_unmap_memobject_tests.cpp | 2 +- .../command_queue/enqueue_with_walker_partition_tests.cpp | 2 +- .../command_queue/enqueue_write_buffer_rect_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_write_buffer_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_write_image_tests.cpp | 2 +- opencl/test/unit_test/command_queue/finish_tests.cpp | 2 +- .../unit_test/command_queue/get_command_queue_info_tests.cpp | 2 +- .../command_queue/get_size_required_buffer_tests.cpp | 2 +- .../command_queue/get_size_required_image_tests.cpp | 2 +- .../test/unit_test/command_queue/get_size_required_tests.cpp | 2 +- .../test/unit_test/command_queue/local_work_size_tests.cpp | 2 +- .../unit_test/command_queue/multi_dispatch_info_tests.cpp | 3 ++- .../unit_test/command_queue/multiple_map_buffer_tests.cpp | 2 +- .../unit_test/command_queue/multiple_map_image_tests.cpp | 2 +- opencl/test/unit_test/command_queue/oom_buffer_tests.cpp | 2 +- opencl/test/unit_test/command_queue/oom_image_tests.cpp | 2 +- opencl/test/unit_test/command_queue/oom_tests.cpp | 2 +- .../unit_test/command_queue/read_write_buffer_cpu_copy.cpp | 2 +- .../unit_test/command_queue/sync_buffer_handler_tests.cpp | 2 +- .../test/unit_test/command_queue/work_group_size_tests.cpp | 2 +- .../test/unit_test/command_queue/zero_size_enqueue_tests.cpp | 2 +- .../command_stream/aub_command_stream_receiver_1_tests.cpp | 2 +- .../command_stream/aub_command_stream_receiver_2_tests.cpp | 2 +- .../command_stream/aub_command_stream_receiver_3_tests.cpp | 2 +- .../aub_command_stream_receiver_tests_xehp_and_later.cpp | 2 +- .../test/unit_test/command_stream/aub_file_stream_tests.cpp | 2 +- .../test/unit_test/command_stream/aub_subcapture_tests.cpp | 2 +- .../command_stream/cache_flush_tests_dg2_and_later.cpp | 2 +- .../command_stream/cl_command_stream_receiver_tests.cpp | 2 +- opencl/test/unit_test/command_stream/cmd_parse_tests.cpp | 2 +- .../command_stream_receiver_flush_task_1_tests.cpp | 2 +- .../command_stream_receiver_flush_task_2_tests.cpp | 2 +- .../command_stream_receiver_flush_task_3_tests.cpp | 2 +- .../command_stream_receiver_flush_task_4_tests.cpp | 2 +- .../command_stream_receiver_flush_task_gmock_tests.cpp | 2 +- ...mmand_stream_receiver_flush_task_tests_xehp_and_later.cpp | 2 +- .../command_stream/command_stream_receiver_hw_1_tests.cpp | 2 +- .../command_stream/command_stream_receiver_hw_2_tests.cpp | 2 +- .../command_stream/command_stream_receiver_hw_fixture.h | 3 ++- .../command_stream_receiver_hw_tests_dg2_and_later.cpp | 2 +- .../command_stream_receiver_hw_tests_xehp_and_later.cpp | 2 +- .../command_stream/command_stream_receiver_mt_tests.cpp | 2 +- ...eam_receiver_simulated_common_hw_tests_xehp_and_later.cpp | 2 +- .../command_stream_receiver_simulated_tests.cpp | 2 +- .../command_stream_receiver_with_aub_dump_tests.cpp | 2 +- opencl/test/unit_test/command_stream/compute_mode_tests.h | 3 +-- .../test/unit_test/command_stream/compute_mode_tests_dg2.cpp | 2 +- .../command_stream/compute_mode_tests_xehp_and_later.cpp | 2 +- .../command_stream/create_command_stream_receiver_tests.cpp | 2 +- .../command_stream/experimental_command_buffer_tests.cpp | 2 +- opencl/test/unit_test/command_stream/get_devices_tests.cpp | 2 +- .../unit_test/command_stream/implicit_scaling_ocl_tests.cpp | 3 +-- .../command_stream/submissions_aggregator_tests.cpp | 2 +- .../tbx_command_stream_receiver_tests_xehp_and_later.cpp | 2 +- .../unit_test/command_stream/tbx_command_stream_tests.cpp | 2 +- .../compiler_interface/cl_compiler_interface_tests.cpp | 2 +- .../compiler_interface/default_cl_cache_config_tests.cpp | 3 ++- opencl/test/unit_test/context/context_multi_device_tests.cpp | 2 +- opencl/test/unit_test/context/context_negative_tests.cpp | 2 +- opencl/test/unit_test/context/context_tests.cpp | 2 +- opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp | 2 +- opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp | 2 +- opencl/test/unit_test/device/device_tests.cpp | 2 +- opencl/test/unit_test/device/device_win_timers_tests.cpp | 2 +- opencl/test/unit_test/device/get_device_info_tests.cpp | 2 +- opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp | 2 +- opencl/test/unit_test/device/sub_device_tests.cpp | 2 +- opencl/test/unit_test/event/async_events_handler_tests.cpp | 2 +- opencl/test/unit_test/event/event_callbacks_tests.cpp | 3 ++- opencl/test/unit_test/event/event_tests.cpp | 2 +- .../execution_environment/execution_environment_tests.cpp | 2 +- opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h | 2 +- opencl/test/unit_test/fixtures/cl_preemption_fixture.cpp | 2 +- opencl/test/unit_test/fixtures/cl_preemption_fixture.h | 2 +- opencl/test/unit_test/fixtures/d3d_test_fixture.h | 2 +- opencl/test/unit_test/fixtures/device_host_queue_fixture.h | 3 ++- .../test/unit_test/fixtures/execution_model_kernel_fixture.h | 3 ++- opencl/test/unit_test/fixtures/hello_world_fixture.h | 2 +- opencl/test/unit_test/fixtures/image_fixture.h | 2 +- opencl/test/unit_test/fixtures/kernel_arg_fixture.h | 3 ++- .../test/unit_test/fixtures/kernel_work_group_info_fixture.h | 2 +- opencl/test/unit_test/fixtures/multi_tile_fixture.h | 2 +- opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h | 3 ++- opencl/test/unit_test/fixtures/scenario_test_fixture.h | 2 +- opencl/test/unit_test/gen11/coherency_tests_gen11.cpp | 3 +-- .../gen11/command_stream_receiver_hw_tests_gen11.cpp | 2 +- opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp | 5 +++-- opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp | 3 +-- opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp | 3 ++- opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp | 2 +- opencl/test/unit_test/gen11/icllp/excludes_icllp.cpp | 2 +- opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp | 5 +++-- .../test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp | 3 +-- .../test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp | 2 +- .../gen11/icllp/test_program_media_sampler_icllp.cpp | 3 +-- opencl/test/unit_test/gen11/image_tests_gen11.cpp | 2 +- opencl/test/unit_test/gen11/kernel_tests_gen11.cpp | 3 ++- opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp | 5 +++-- opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp | 3 +-- opencl/test/unit_test/gen11/sampler_tests_gen11.cpp | 2 +- .../gen11/tbx_command_stream_receiver_tests_gen11.cpp | 2 +- opencl/test/unit_test/gen11/test_device_caps_gen11.cpp | 2 +- opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp | 3 ++- opencl/test/unit_test/gen11/test_sample_gen11.cpp | 3 ++- .../unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp | 3 +-- opencl/test/unit_test/gen12lp/adlp/excludes_adlp.cpp | 2 +- opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp | 3 ++- opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp | 2 +- opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp | 3 ++- .../gen12lp/aub_command_stream_receiver_tests_gen12lp.inl | 2 +- opencl/test/unit_test/gen12lp/buffer_tests_gen12lp.inl | 2 +- opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl | 3 +-- .../gen12lp/command_stream_receiver_hw_tests_gen12lp.inl | 2 +- ...and_stream_receiver_simulated_common_hw_tests_gen12lp.inl | 2 +- opencl/test/unit_test/gen12lp/dg1/excludes_dg1.cpp | 2 +- .../gen12lp/dg1/execution_environment_tests_dg1.cpp | 3 +-- opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp | 2 +- opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp | 4 ++-- .../test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp | 2 +- .../test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl | 3 ++- opencl/test/unit_test/gen12lp/excludes_gen12lp.cpp | 2 +- opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp | 2 +- opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl | 2 +- opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl | 3 ++- opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl | 3 ++- opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp | 2 +- .../test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp | 3 +-- opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl | 2 +- .../gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl | 2 +- opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl | 2 +- opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl | 5 +++-- opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl | 3 ++- opencl/test/unit_test/gen12lp/tgllp/buffer_tests_tgllp.cpp | 2 +- opencl/test/unit_test/gen12lp/tgllp/excludes_tgllp.cpp | 2 +- opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp | 2 +- .../unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp | 3 +-- .../gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp | 2 +- opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp | 3 +-- opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp | 4 ++-- opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp | 3 +-- .../gen8/bdw/windows/test_device_caps_bdw_windows.cpp | 4 ++-- opencl/test/unit_test/gen8/coherency_tests_gen8.cpp | 2 +- .../unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp | 2 +- opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp | 2 +- opencl/test/unit_test/gen8/image_tests_gen8.cpp | 3 ++- opencl/test/unit_test/gen8/kernel_tests_gen8.cpp | 5 +++-- opencl/test/unit_test/gen8/sampler_tests_gen8.cpp | 2 +- opencl/test/unit_test/gen8/test_device_caps_gen8.cpp | 2 +- opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp | 3 ++- opencl/test/unit_test/gen8/test_sample_gen8.cpp | 3 ++- .../test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp | 5 ++--- opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp | 3 ++- opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp | 3 ++- opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp | 3 +-- .../gen9/bxt/windows/test_device_caps_bxt_windows.cpp | 5 +++-- opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp | 5 +++-- opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp | 3 +-- .../gen9/cfl/windows/test_device_caps_cfl_windows.cpp | 5 +++-- opencl/test/unit_test/gen9/coherency_tests_gen9.cpp | 2 +- .../unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp | 2 +- opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp | 2 +- opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp | 2 +- opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp | 3 ++- opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp | 3 +-- .../gen9/glk/windows/test_device_caps_glk_windows.cpp | 5 +++-- opencl/test/unit_test/gen9/image_tests_gen9.cpp | 3 ++- opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp | 3 ++- opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp | 3 +-- .../gen9/kbl/windows/test_device_caps_kbl_windows.cpp | 5 +++-- opencl/test/unit_test/gen9/kernel_tests_gen9.cpp | 3 ++- opencl/test/unit_test/gen9/sampler_tests_gen9.cpp | 2 +- opencl/test/unit_test/gen9/sip_tests_gen9.cpp | 3 +-- opencl/test/unit_test/gen9/skl/device_tests_skl.cpp | 3 ++- opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp | 3 ++- opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp | 3 +-- opencl/test/unit_test/gen9/skl/test_sample_skl.cpp | 3 ++- .../gen9/skl/windows/test_device_caps_skl_windows.cpp | 5 +++-- opencl/test/unit_test/gen9/test_device_caps_gen9.cpp | 2 +- opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp | 3 ++- opencl/test/unit_test/gen9/test_sample_gen9.cpp | 3 ++- .../test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp | 5 ++--- .../gen_common/exclude_tests/exclude_test_declare.cpp | 3 +-- .../gen_common/exclude_tests/exclude_test_exclude.cpp | 2 +- opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp | 2 +- opencl/test/unit_test/gtpin/gtpin_tests.cpp | 2 +- .../unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp | 2 +- opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp | 2 +- .../test/unit_test/helpers/dispatch_info_builder_tests.cpp | 3 ++- opencl/test/unit_test/helpers/dispatch_info_tests.cpp | 3 ++- .../helpers/engine_node_helper_tests_xehp_and_later.cpp | 2 +- .../test/unit_test/helpers/hardware_commands_helper_tests.h | 2 +- opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp | 2 +- .../test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp | 2 +- .../test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp | 2 +- .../test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp | 3 +-- opencl/test/unit_test/helpers/kmd_notify_tests.cpp | 2 +- .../test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp | 3 +-- opencl/test/unit_test/helpers/per_thread_data_tests.cpp | 2 +- opencl/test/unit_test/helpers/ray_tracing_helper_tests.cpp | 2 +- opencl/test/unit_test/helpers/task_information_tests.cpp | 2 +- .../test/unit_test/helpers/test_preamble_dg2_and_later.cpp | 2 +- opencl/test/unit_test/helpers/timestamp_packet_tests.h | 2 +- opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp | 4 ++-- .../unit_test/helpers/windows/kmd_notify_windows_tests.cpp | 3 +-- opencl/test/unit_test/igdrcl_tests_pch.h | 3 +-- opencl/test/unit_test/kernel/cache_flush_tests.inl | 2 +- .../unit_test/kernel/cache_flush_xehp_and_later_tests.inl | 2 +- opencl/test/unit_test/kernel/clone_kernel_tests.cpp | 2 +- opencl/test/unit_test/kernel/debug_kernel_tests.cpp | 2 +- opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp | 2 +- opencl/test/unit_test/kernel/image_transformer_tests.cpp | 2 +- .../test/unit_test/kernel/kernel_accelerator_arg_tests.cpp | 3 ++- opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp | 2 +- opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h | 3 ++- opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp | 2 +- opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp | 2 +- opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp | 3 ++- opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp | 3 ++- .../kernel/kernel_cache_flush_requirements_tests.cpp | 2 +- opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp | 2 +- opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp | 3 ++- opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp | 2 +- opencl/test/unit_test/kernel/kernel_slm_tests.cpp | 2 +- opencl/test/unit_test/kernel/kernel_tests.cpp | 2 +- opencl/test/unit_test/kernel/kernel_tests_pvc_and_later.cpp | 3 ++- opencl/test/unit_test/kernel/kernel_transformable_tests.cpp | 2 +- opencl/test/unit_test/kernel/parent_kernel_tests.cpp | 2 +- .../test/unit_test/kernel/substitute_kernel_heap_tests.cpp | 2 +- opencl/test/unit_test/linux/drm_null_device_tests.cpp | 2 +- opencl/test/unit_test/linux/main_linux_dll.cpp | 2 +- opencl/test/unit_test/linux/os_interface_linux_tests.cpp | 2 +- opencl/test/unit_test/linux/va_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/buffer_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp | 2 +- .../test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp | 2 +- .../unit_test/mem_obj/create_image_in_local_memory_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/image1d_tests.cpp | 3 ++- opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/image2d_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/image3d_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/image_array_size_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/image_compression_fixture.h | 2 +- opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp | 2 +- .../unit_test/mem_obj/image_release_mapped_ptr_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/image_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp | 2 +- .../test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp | 3 ++- opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp | 2 +- .../test/unit_test/mem_obj/map_operations_handler_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/nv12_image_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp | 2 +- opencl/test/unit_test/mem_obj/pipe_tests.cpp | 2 +- .../test/unit_test/memory_manager/host_ptr_manager_tests.cpp | 2 +- .../memory_manager/internal_allocation_storage_tests.cpp | 2 +- .../memory_manager_allocate_in_device_pool_tests.cpp | 2 +- .../memory_manager_allocate_in_preferred_pool_tests.cpp | 2 +- .../memory_manager/memory_manager_multi_device_tests.cpp | 2 +- .../test/unit_test/memory_manager/memory_manager_tests.cpp | 2 +- .../unit_test/memory_manager/migraton_controller_tests.cpp | 2 +- opencl/test/unit_test/memory_manager/storage_info_tests.cpp | 2 +- opencl/test/unit_test/memory_manager/surface_tests.cpp | 2 +- .../memory_manager/unified_memory_manager_tests.cpp | 2 +- .../unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl | 5 +++-- .../unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl | 3 ++- .../unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl | 5 +++-- .../unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl | 2 +- .../mt_tests/device_queue/device_queue_mt_tests.cpp | 2 +- .../gen12lp/rkl/offline_compiler_tests_rkl.cpp | 2 +- .../offline_compiler/gen8/bdw/offline_compiler_tests_bdw.cpp | 2 +- .../offline_compiler/gen9/skl/offline_compiler_tests_skl.cpp | 2 +- opencl/test/unit_test/os_interface/device_factory_tests.cpp | 2 +- opencl/test/unit_test/os_interface/hw_info_config_tests.h | 2 +- .../test/unit_test/os_interface/linux/debug_env_reader.cpp | 3 +-- .../os_interface/linux/device_command_stream_tests.cpp | 2 +- .../test/unit_test/os_interface/linux/device_factory_tests.h | 3 +-- .../unit_test/os_interface/linux/drm_buffer_object_tests.cpp | 3 +-- .../os_interface/linux/drm_command_stream_fixture.h | 2 +- .../os_interface/linux/drm_command_stream_mm_tests.cpp | 2 +- .../os_interface/linux/drm_command_stream_tests_1.cpp | 2 +- .../os_interface/linux/drm_command_stream_tests_2.cpp | 2 +- .../os_interface/linux/drm_gem_close_worker_tests.cpp | 2 +- .../test/unit_test/os_interface/linux/drm_mapper_tests.cpp | 3 +-- .../unit_test/os_interface/linux/drm_memory_info_tests.cpp | 2 +- .../os_interface/linux/drm_memory_manager_localmem_tests.cpp | 2 +- .../os_interface/linux/drm_memory_manager_tests.cpp | 2 +- .../os_interface/linux/drm_residency_handler_tests.cpp | 3 +-- .../unit_test/os_interface/linux/drm_va_sharing_tests.cpp | 2 +- .../unit_test/os_interface/linux/file_logger_linux_tests.cpp | 2 +- .../unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp | 2 +- .../os_interface/linux/ioctl_helper_tests_prelim.cpp | 3 +-- .../os_interface/linux/ioctl_helper_tests_upstream.cpp | 2 +- .../linux_create_command_queue_with_properties_tests.cpp | 2 +- opencl/test/unit_test/os_interface/linux/os_time_test.cpp | 2 +- .../test/unit_test/os_interface/linux/prelim_helper_func.cpp | 2 +- opencl/test/unit_test/os_interface/os_library_tests.cpp | 3 +-- .../os_interface/performance_counters_gen_tests.cpp | 3 +-- .../os_interface/windows/device_command_stream_tests.cpp | 2 +- .../unit_test/os_interface/windows/file_logger_win_tests.cpp | 2 +- .../os_interface/windows/hw_info_config_win_tests.cpp | 3 +-- .../unit_test/os_interface/windows/os_library_win_tests.cpp | 3 +-- .../unit_test/os_interface/windows/registry_reader_tests.cpp | 3 +-- opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp | 2 +- .../os_interface/windows/wddm_address_space_tests.cpp | 3 +-- .../os_interface/windows/wddm_kmdaf_listener_tests.cpp | 2 +- .../unit_test/os_interface/windows/wddm_mapper_tests.cpp | 3 +-- .../os_interface/windows/wddm_memory_manager_tests.h | 2 +- .../os_interface/windows/wddm_residency_controller_tests.cpp | 2 +- .../os_interface/windows/wddm_residency_handler_tests.cpp | 2 +- opencl/test/unit_test/profiling/profiling_tests.cpp | 2 +- opencl/test/unit_test/program/printf_handler_tests.cpp | 2 +- opencl/test/unit_test/program/process_debug_data_tests.cpp | 5 +++-- opencl/test/unit_test/program/program_data_tests.cpp | 2 +- opencl/test/unit_test/program/program_nonuniform.cpp | 2 +- opencl/test/unit_test/program/program_tests.cpp | 2 +- .../unit_test/program/program_with_kernel_debug_tests.cpp | 2 +- opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp | 2 +- .../test/unit_test/sampler/sampler_tests_xehp_and_later.cpp | 2 +- .../scenarios/blocked_enqueue_barrier_scenario_tests.cpp | 2 +- .../blocked_enqueue_with_callback_scenario_tests.cpp | 3 ++- .../enqueue_read_write_buffer_scenarios_windows_tests.cpp | 2 +- opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp | 2 +- opencl/test/unit_test/scheduler/scheduler_source_tests.cpp | 2 +- opencl/test/unit_test/scheduler/scheduler_source_tests.h | 5 +++-- .../sharings/gl/windows/gl_arb_sync_event_tests.cpp | 2 +- .../sharings/gl/windows/gl_create_from_texture_tests.cpp | 2 +- .../sharings/gl/windows/gl_reused_buffers_tests.cpp | 2 +- .../test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp | 2 +- .../unit_test/sharings/unified/unified_sharing_fixtures.h | 2 +- .../unit_test/sharings/unified/unified_sharing_tests.cpp | 2 +- .../test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp | 3 ++- opencl/test/unit_test/sharings/va/va_sharing_tests.cpp | 2 +- .../source_level_debugger_csr_tests.cpp | 2 +- .../source_level_debugger/source_level_debugger_csr_tests.h | 2 +- .../source_level_debugger_device_tests.cpp | 2 +- .../source_level_debugger/source_level_debugger_tests.cpp | 2 +- opencl/test/unit_test/utilities/debug_file_reader_tests.inl | 3 +-- .../test/unit_test/utilities/debug_settings_reader_tests.cpp | 4 ++-- opencl/test/unit_test/utilities/tag_allocator_tests.cpp | 2 +- opencl/test/unit_test/windows/get_devices_tests.cpp | 3 +-- opencl/test/unit_test/windows/os_interface_tests.cpp | 3 +-- opencl/test/unit_test/windows/wddm_create_tests.cpp | 3 +-- .../unit_test/xe_hp_core/compute_mode_tests_xe_hp_core.cpp | 2 +- .../unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp | 2 +- opencl/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp | 2 +- .../unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp | 2 +- .../unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp | 3 ++- opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp | 3 ++- .../unit_test/xe_hp_core/xehp/cache_flush_tests_xehp.inl | 2 +- .../test/unit_test/xe_hp_core/xehp/get_device_info_xehp.inl | 2 +- opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl | 2 +- .../unit_test/xe_hp_core/xehp/memory_manager_tests_xehp.inl | 3 +-- opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl | 2 +- .../xe_hp_core/xehp/source_level_debugger_csr_tests_xehp.cpp | 2 +- .../xe_hp_core/xehp/test_command_stream_receiver_xehp.inl | 2 +- .../test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl | 2 +- .../unit_test/xe_hp_core/xehp/test_hw_info_config_xehp.inl | 2 +- .../unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl | 2 +- .../unit_test/xe_hp_core/xehp/test_platform_caps_xehp.inl | 3 ++- opencl/test/unit_test/xe_hp_core/xehp/test_preamble_xehp.cpp | 2 +- .../test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl | 2 +- .../aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp | 3 +-- .../aub_command_stream_receiver_2_tests_xe_hpc_core.cpp | 2 +- .../unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp | 2 +- .../command_stream_receiver_hw_tests_xe_hpc_core.cpp | 2 +- .../unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp | 2 +- .../test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp | 2 +- opencl/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp | 2 +- .../xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp | 2 +- .../test/unit_test/xe_hpc_core/pvc/get_device_info_pvc.cpp | 3 ++- opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp | 2 +- .../test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp | 2 +- .../unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp | 3 +-- .../xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp | 2 +- .../unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp | 2 +- .../unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp | 3 ++- .../test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp | 3 ++- .../aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp | 3 +-- .../command_stream_receiver_hw_tests_xe_hpg_core.cpp | 2 +- .../unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp | 2 +- opencl/test/unit_test/xe_hpg_core/dg2/excludes_dg2.cpp | 2 +- .../test/unit_test/xe_hpg_core/dg2/get_device_info_dg2.cpp | 3 ++- opencl/test/unit_test/xe_hpg_core/dg2/hw_info_tests_dg2.cpp | 2 +- .../unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp | 3 +-- opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp | 2 +- .../unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp | 2 +- .../test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp | 2 +- .../unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp | 3 +-- .../dg2/windows/hw_info_config_tests_dg2_windows.cpp | 3 +-- opencl/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp | 2 +- .../unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/test_local_work_size_xe_hpg_core.cpp | 2 +- .../test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp | 3 ++- 493 files changed, 605 insertions(+), 571 deletions(-) diff --git a/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp b/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp index 5d649aa605..cde4c20b06 100644 --- a/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp +++ b/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/surface.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/additional_extensions_tests.cpp b/opencl/test/unit_test/api/additional_extensions_tests.cpp index bfce6283be..549f386fba 100644 --- a/opencl/test/unit_test/api/additional_extensions_tests.cpp +++ b/opencl/test/unit_test/api/additional_extensions_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/api/additional_extensions.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_api_tests.h b/opencl/test/unit_test/api/cl_api_tests.h index 09a5f0d0da..8c9504b74b 100644 --- a/opencl/test/unit_test/api/cl_api_tests.h +++ b/opencl/test/unit_test/api/cl_api_tests.h @@ -11,6 +11,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/api/api.h" #include "opencl/source/command_queue/command_queue.h" @@ -20,7 +21,6 @@ #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/api/cl_create_command_queue_tests.inl b/opencl/test/unit_test/api/cl_create_command_queue_tests.inl index c736e4124e..326c7adb8b 100644 --- a/opencl/test/unit_test/api/cl_create_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_create_command_queue_tests.inl @@ -8,10 +8,10 @@ #include "shared/source/device/device.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "test.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl b/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl index 16aece191d..4b9684607a 100644 --- a/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl +++ b/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl b/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl index 76e558e3fe..1f2e2b540f 100644 --- a/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl +++ b/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl @@ -7,9 +7,9 @@ #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 "opencl/source/api/api.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/api/cl_enqueue_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_image_tests.inl index 12115bb38d..dd113f66fb 100644 --- a/opencl/test/unit_test/api/cl_enqueue_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_image_tests.inl @@ -5,11 +5,12 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl index 8fc5906d6e..bf676b712a 100644 --- a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl +++ b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl @@ -6,10 +6,10 @@ */ #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/test/unit_test/api/cl_api_tests.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl index 55e1dcdb48..b95555494d 100644 --- a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl +++ b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl @@ -9,9 +9,9 @@ #include "shared/test/common/helpers/debug_manager_state_restore.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/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_device_info_pvc_and_later_tests.cpp b/opencl/test/unit_test/api/cl_get_device_info_pvc_and_later_tests.cpp index 480ffc2ac1..fae94881a0 100644 --- a/opencl/test/unit_test/api/cl_get_device_info_pvc_and_later_tests.cpp +++ b/opencl/test/unit_test/api/cl_get_device_info_pvc_and_later_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/api/cl_api_tests.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl b/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl index 18057c72d6..e3873d8cd6 100644 --- a/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl @@ -5,6 +5,8 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" @@ -13,7 +15,6 @@ #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/os_interface/mock_performance_counters.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl index 3628fc65f1..a39d0588fd 100644 --- a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl index 6f6bdf09d9..d681c29a7f 100644 --- a/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl +++ b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp index 48a1ceb1f6..b81fa4fc2f 100644 --- a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp @@ -11,6 +11,7 @@ #include "shared/source/helpers/state_base_address.h" #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 "opencl/extensions/public/cl_ext_private.h" @@ -18,7 +19,6 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" -#include "test.h" #include "hw_cmds.h" diff --git a/opencl/test/unit_test/api/cl_release_event_tests.inl b/opencl/test/unit_test/api/cl_release_event_tests.inl index cc26ee5d36..509496f048 100644 --- a/opencl/test/unit_test/api/cl_release_event_tests.inl +++ b/opencl/test/unit_test/api/cl_release_event_tests.inl @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/context/context.h" #include "opencl/source/event/event.h" -#include "test.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_retain_release_device_tests.inl b/opencl/test/unit_test/api/cl_retain_release_device_tests.inl index 7b61548fb7..b3082ac901 100644 --- a/opencl/test/unit_test/api/cl_retain_release_device_tests.inl +++ b/opencl/test/unit_test/api/cl_retain_release_device_tests.inl @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl b/opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl index 18ebc521be..cbcfa22404 100644 --- a/opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl @@ -6,11 +6,11 @@ */ #include "shared/source/device/device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/context/context.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/test/unit_test/fixtures/device_queue_matcher.h" -#include "test.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl index eca21986be..603c68970b 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl @@ -6,11 +6,11 @@ */ #include "shared/source/memory_manager/unified_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl index 5b00243d3f..ba193178e3 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl @@ -5,10 +5,11 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/helpers/cl_hw_helper.h" #include "opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_unload_compiler_tests.inl b/opencl/test/unit_test/api/cl_unload_compiler_tests.inl index 8f2801dcdb..035682e6d1 100644 --- a/opencl/test/unit_test/api/cl_unload_compiler_tests.inl +++ b/opencl/test/unit_test/api/cl_unload_compiler_tests.inl @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub/aub_helper_tests.cpp b/opencl/test/unit_test/aub/aub_helper_tests.cpp index 02028245b0..db52793d81 100644 --- a/opencl/test/unit_test/aub/aub_helper_tests.cpp +++ b/opencl/test/unit_test/aub/aub_helper_tests.cpp @@ -13,10 +13,10 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/tbx/tbx_proto.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_lrca_helper.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp index 7400dc98ac..4a70d2212a 100644 --- a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp +++ b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp @@ -13,12 +13,12 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/mocks/mock_memory_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" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp index a5b3ccecf0..c2624179c2 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp @@ -7,11 +7,11 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp index 4cc4ed94e1..d92ac46e6e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp @@ -7,11 +7,11 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp index 8104ab9f31..cae17fe87d 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp @@ -8,11 +8,11 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp index bd5d6ec551..8b516e7a5c 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp @@ -8,11 +8,11 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp index fe927c7c3d..44fbcc9953 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp @@ -9,11 +9,11 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp index f0f8dfe05e..65f8e0491a 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" @@ -21,7 +22,6 @@ #include "opencl/test/unit_test/fixtures/two_walker_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp index bfd48a9b41..2bc3ce3e50 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp @@ -5,10 +5,11 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp index 826267c588..3c47e8723c 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp @@ -9,11 +9,11 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_printf_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_printf_kernel_aub_tests.cpp index 57435ea6db..9add25608d 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_printf_kernel_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_printf_kernel_aub_tests.cpp @@ -5,10 +5,11 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" #include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "test.h" #include "command_enqueue_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp index 176b007334..c5cadb8b42 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp @@ -9,11 +9,11 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_configuration/aub_tests/aub_tests_configuration.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp index 64700f44a3..a521d9d911 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp @@ -8,11 +8,11 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp index d9cd8170f6..a54fdf6b8d 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp @@ -10,12 +10,12 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h index fc84f0acda..e2208d710c 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h @@ -8,11 +8,11 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp index e35c170a30..c73fa9e63f 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp @@ -8,12 +8,12 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp index 3a766a9488..73a533c754 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp @@ -10,12 +10,12 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp index 1e7e867864..8b9b9a318d 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp @@ -8,11 +8,11 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/device/device.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp index fb8865b2c8..4e19b7a701 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp @@ -9,11 +9,11 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp index 4fd14794ec..242f567769 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp @@ -8,8 +8,7 @@ #include "opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h" #include "shared/source/memory_manager/allocations_list.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp index f0ca35fd5e..5f7e950ee5 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp @@ -9,12 +9,12 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp index 8d1807acfc..76b9b868fc 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp @@ -11,10 +11,10 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include "aub_command_stream_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h index db3c09e60f..6c43fd0c4f 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h @@ -13,8 +13,7 @@ #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/os_interface/hw_info_config.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" #include "aub_mapper.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp index 65d74a53e5..942ae43659 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/command_stream/aub_command_stream_receiver_hw.h" #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp b/opencl/test/unit_test/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp index 53fbfde7b6..ac2de59c17 100644 --- a/opencl/test/unit_test/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp +++ b/opencl/test/unit_test/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp @@ -6,13 +6,13 @@ */ #include "shared/source/built_ins/built_ins.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sampler/sampler.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp index 330ed5572c..547d4a564c 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp @@ -11,6 +11,7 @@ #include "shared/source/utilities/tag_allocator.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 "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" @@ -20,7 +21,6 @@ #include "opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using Gen12LPAubBatchBufferTests = Test; using Gen12LPTimestampTests = Test>; diff --git a/opencl/test/unit_test/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp b/opencl/test/unit_test/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp index afc022c5b9..9fedfff85a 100644 --- a/opencl/test/unit_test/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp +++ b/opencl/test/unit_test/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp @@ -6,13 +6,13 @@ */ #include "shared/source/built_ins/built_ins.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sampler/sampler.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp index 46ed687481..b65a60f685 100644 --- a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp @@ -8,12 +8,12 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp index 3bb36caff6..1ef6d1a798 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp index b237ab23e5..16ccba8d8e 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h" -#include "test.h" namespace NEO { class UnifiedMemoryCopyAubTest : public UnifiedMemoryAubFixture, 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 9421181050..81e73059cf 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -19,6 +19,7 @@ #include "shared/test/common/mocks/mock_compiler_interface.h" #include "shared/test/common/mocks/mock_compilers.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/built_ins/aux_translation_builtin.h" @@ -37,7 +38,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "compiler_options.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/built_ins/built_in_tests_ocl.cpp b/opencl/test/unit_test/built_ins/built_in_tests_ocl.cpp index 510a78df69..b60dafc738 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests_ocl.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests_ocl.cpp @@ -7,10 +7,9 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/built_ins/built_in_tests_shared.inl" -#include "test.h" - #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/built_ins/sip_tests.cpp b/opencl/test/unit_test/built_ins/sip_tests.cpp index 4f46257acc..4dfd72f7cb 100644 --- a/opencl/test/unit_test/built_ins/sip_tests.cpp +++ b/opencl/test/unit_test/built_ins/sip_tests.cpp @@ -10,9 +10,9 @@ #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 "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp index d71a44aa08..1cb987690f 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.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" @@ -27,7 +28,6 @@ #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp index f176c26a4c..9136149c63 100644 --- a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/mocks/mock_os_library.h" #include "shared/test/common/mocks/mock_source_level_debugger.h" #include "shared/test/common/test_macros/matchers.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "shared/test/unit_test/utilities/base_object_utils.h" @@ -29,7 +30,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp index 9ec2133370..5aec6c82fa 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -23,6 +23,7 @@ #include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -47,7 +48,6 @@ #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp b/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp index b7b262f30b..95c09ab5d6 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp @@ -8,12 +8,12 @@ #include "shared/source/helpers/engine_node_helper.h" #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/test.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/csr_selection_args_tests.cpp b/opencl/test/unit_test/command_queue/csr_selection_args_tests.cpp index d19bc30813..901ab9ec74 100644 --- a/opencl/test/unit_test/command_queue/csr_selection_args_tests.cpp +++ b/opencl/test/unit_test/command_queue/csr_selection_args_tests.cpp @@ -5,10 +5,11 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_image.h" -#include "test.h" namespace NEO { TEST(CsrSelectionArgsTests, givenBuffersWhenCreatingCsrSelectionArgsThenSetupArgsCorrectly) { diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index 1eb6c73abd..142968de41 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/command_queue/gpgpu_walker.h" @@ -29,7 +30,6 @@ #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp index ccc7726cac..5e3f1fa70c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" @@ -14,7 +15,6 @@ #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp index dd8aa39b30..359adac17b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp @@ -11,6 +11,7 @@ #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/event/event_builder.h" @@ -24,7 +25,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp index a621d88bcb..7ff305ebd1 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp @@ -8,6 +8,7 @@ #include "shared/source/os_interface/os_context.h" #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/test.h" #include "opencl/source/command_queue/resource_barrier.h" #include "opencl/source/event/event_builder.h" @@ -20,7 +21,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" -#include "test.h" namespace NEO { using IsDG2AndLater = IsAtLeastXeHpgCore; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp index d194fd8f88..8766bb4c3c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp @@ -8,13 +8,13 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/helpers/constants.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp index 96b91154a9..eeb8c07b5c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -19,7 +20,6 @@ #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index 30437f1181..ee07cd20ef 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp index 27b4ee9158..f2776bb722 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp @@ -9,6 +9,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp index 6acc926304..7f9a4f809e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h" @@ -15,7 +16,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp index e3ffe8a893..eac102264a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/helpers/kernel_binary_helper.h" #include "shared/test/common/helpers/kernel_filename_helper.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/program/program.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/program/program_from_binary.h" -#include "test.h" #include "compiler_options.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp index aa1bcb312c..60e67bab45 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp @@ -5,10 +5,11 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp index f1ea3bd892..7c6d911bde 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_allocation_properties.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue.h" @@ -23,7 +24,6 @@ #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "test.h" #include "reg_configs_common.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 e62b81c7a4..37d2301d7c 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 @@ -6,12 +6,12 @@ */ #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" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp index dd7beec3b1..3ff91cea81 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp @@ -7,12 +7,12 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/convert_color.h" #include "opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp index 8bb13abd26..8da9541f81 100644 --- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" @@ -30,7 +31,6 @@ #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "test_traits_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp index ff038b1453..f47574b05d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp @@ -5,11 +5,12 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp index e61772550b..e45e093e76 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp @@ -6,12 +6,12 @@ */ #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp index 84f97eccae..3f6108e9b3 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/two_walker_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp index 0aebe4e59b..1b47009bb2 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/fixtures/two_walker_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp index 6774d5634d..351e085157 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp index 0b37f39f4c..a44be04d5e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp @@ -11,6 +11,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_allocation_properties.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/event/user_event.h" @@ -21,7 +22,6 @@ #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp index dcbcf0bef2..1afeee720c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp @@ -9,11 +9,11 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp b/opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp index 24f6c301a0..4a45b7e7bb 100644 --- a/opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_media_kernel_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/enqueue_media_kernel_xehp_and_later.cpp index 937c7c19d2..71bf7958d2 100644 --- a/opencl/test/unit_test/command_queue/enqueue_media_kernel_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_media_kernel_xehp_and_later.cpp @@ -8,9 +8,9 @@ #include "shared/source/helpers/pipeline_select_helper.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" -#include "test.h" using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp index 9bcc343956..43a2c8e651 100644 --- a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp @@ -6,13 +6,13 @@ */ #include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/event/user_event.h" #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/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp index b39b1e33c8..0da4bfbceb 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/built_ins/built_ins.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 "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp index 118ad63c61..d63f823be8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp @@ -13,6 +13,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #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 "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -22,7 +23,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index cd1a77a9ab..522a284db2 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp index 86fd8da8d0..efda6edff2 100644 --- a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/command_queue/resource_barrier.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp index 883be1be04..84dbbcab57 100644 --- a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp @@ -8,6 +8,7 @@ #include "shared/source/os_interface/os_context.h" #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/test.h" #include "opencl/source/command_queue/resource_barrier.h" #include "opencl/source/event/event_builder.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp index a332736d51..f9c6125ea8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -11,6 +11,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp index 18605339dc..9ac026e04a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp index dba0fda694..99e67efc7e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp @@ -17,6 +17,7 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #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/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "shared/test/unit_test/utilities/base_object_utils.h" @@ -29,7 +30,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp index c3a85947f8..2705e3b6fe 100644 --- a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -18,7 +19,6 @@ #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp index fd500e1749..4a60152b9c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" @@ -15,7 +16,6 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp index 53217c7be2..5e6da4f7e4 100644 --- a/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp @@ -10,12 +10,12 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" struct EnqueueWithWalkerPartitionTests : public ::testing::Test { void SetUp() override { diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp index c8fd61dbe4..5499140edc 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/built_ins/built_ins.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 "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp index e92d6b2162..864d82c061 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp @@ -11,6 +11,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #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 "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -20,7 +21,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index 8f6bc6dfbd..eeb7cad575 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h" @@ -19,7 +20,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/finish_tests.cpp b/opencl/test/unit_test/command_queue/finish_tests.cpp index 5192668397..551eddb049 100644 --- a/opencl/test/unit_test/command_queue/finish_tests.cpp +++ b/opencl/test/unit_test/command_queue/finish_tests.cpp @@ -8,12 +8,12 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.h" +#include "shared/test/common/test_macros/test.h" #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/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp index c1d08370ea..c3d6a2d2e3 100644 --- a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp @@ -6,13 +6,13 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp index 16bf3f5ce8..dce941ae0a 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/test/common/mocks/mock_allocation_properties.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/enqueue_fill_buffer.h" @@ -22,7 +23,6 @@ #include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp index 4f6d8a7b39..39f8ddb158 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/utilities/perf_counter.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -24,7 +25,6 @@ #include "opencl/test/unit_test/fixtures/built_in_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/get_size_required_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_tests.cpp index 4be4f17f3c..2b997c362b 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/built_ins/built_ins.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_barrier.h" @@ -13,7 +14,6 @@ #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp index c09b335d5a..38e3a705fc 100644 --- a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp @@ -8,12 +8,12 @@ #include "shared/source/helpers/local_work_size.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 "opencl/source/command_queue/cl_local_work_size.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp b/opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp index ae513f71e8..77793734c8 100644 --- a/opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp +++ b/opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/mocks/mock_mdi.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp index 5aac4d6a87..7ecd15a1fe 100644 --- a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp @@ -7,13 +7,13 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp index d4b17ebcea..ef0e224737 100644 --- a/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp @@ -7,13 +7,13 @@ #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 "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" namespace NEO { extern ImageFactoryFuncs imageFactory[IGFX_MAX_CORE]; diff --git a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp index 647488f128..d758907d04 100644 --- a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/test/common/fixtures/memory_management_fixture.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h" #include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/oom_image_tests.cpp b/opencl/test/unit_test/command_queue/oom_image_tests.cpp index e1d674156b..92c6c23908 100644 --- a/opencl/test/unit_test/command_queue/oom_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_image_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/memory_manager/memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -13,7 +14,6 @@ #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/oom_tests.cpp b/opencl/test/unit_test/command_queue/oom_tests.cpp index 5068f32f7e..c592503069 100644 --- a/opencl/test/unit_test/command_queue/oom_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_tests.cpp @@ -7,12 +7,12 @@ #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/memory_manager/memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp b/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp index aa9d5495a5..b14d9b846d 100644 --- a/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp +++ b/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp @@ -9,10 +9,10 @@ #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp index edc6ea74c9..268d7c7d95 100644 --- a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/program/sync_buffer_handler.h" #include "shared/test/common/mocks/ult_device_factory.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/api/api.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include "engine_node.h" diff --git a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp index 15b21afb62..e60031846c 100644 --- a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp @@ -7,10 +7,10 @@ #include "shared/source/helpers/local_work_size.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include "patch_shared.h" diff --git a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp index fb922832fc..1ba76d7204 100644 --- a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/memory_manager/unified_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -15,7 +16,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index 76d9ab62df..a006d7dc20 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -18,6 +18,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_graphics_allocation.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/aub_command_stream_receiver_fixture.h" @@ -26,7 +27,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index 9cd64a1edd..aca0303bd1 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -21,6 +21,7 @@ #include "shared/test/common/mocks/mock_gmm.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 "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "opencl/source/mem_obj/mem_obj_helper.h" @@ -33,7 +34,6 @@ #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include "third_party/aub_stream/headers/aubstream.h" diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp index cb0894d586..27691b6c30 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp @@ -13,10 +13,10 @@ #include "shared/test/common/mocks/mock_aub_manager.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_svm_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp index 7c7b967787..040b8fe87d 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp @@ -20,6 +20,7 @@ #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.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" @@ -27,7 +28,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include #include diff --git a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp index e72e636c91..de551ef97d 100644 --- a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp @@ -18,13 +18,13 @@ #include "shared/test/common/mocks/mock_aub_manager.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" -#include "test.h" #include "driver_version.h" #include "sys_calls.h" diff --git a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp index 9534a3eaaa..2374923f2f 100644 --- a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp @@ -7,13 +7,13 @@ #include "shared/source/aub/aub_subcapture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/cache_flush_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_stream/cache_flush_tests_dg2_and_later.cpp index e29020d3e3..aa13c80c0e 100644 --- a/opencl/test/unit_test/command_stream/cache_flush_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_stream/cache_flush_tests_dg2_and_later.cpp @@ -9,12 +9,12 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/helpers/cmd_buffer_validator.h" #include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp index 9387ef94c9..13eed9a955 100644 --- a/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp @@ -8,13 +8,13 @@ #include "shared/source/memory_manager/surface.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/helpers/raii_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_hw_helper.h" -#include "test.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp index 1ce5a33452..88d5aa0d67 100644 --- a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp +++ b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp @@ -6,9 +6,9 @@ */ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp index d2bb39f4a3..a4b539df58 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/ult_hw_helper.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" @@ -19,7 +20,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp index 7316267f80..298869c401 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp @@ -18,6 +18,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/helpers/raii_hw_helper.h" @@ -27,7 +28,6 @@ #include "opencl/test/unit_test/mocks/mock_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp index b669d5932e..c430f24531 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_svm_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/buffer.h" @@ -28,7 +29,6 @@ #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_4_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_4_tests.cpp index 6865da2700..39f6814db0 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_4_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_4_tests.cpp @@ -7,6 +7,7 @@ #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/ult_device_factory.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "test_traits_common.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp index 7aa5c04372..17275d0485 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp @@ -25,6 +25,7 @@ #include "shared/test/common/helpers/ult_hw_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" @@ -40,7 +41,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" -#include "test.h" #include "gtest/gtest.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp index 9bc17770b8..381edcb0ab 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp @@ -12,11 +12,11 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_debugger.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp index 4187c6ef84..c567f362c0 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp @@ -17,6 +17,7 @@ #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 "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" @@ -27,7 +28,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp index 0579547466..e4e01abde6 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp @@ -13,6 +13,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_direct_submission_hw.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" @@ -27,7 +28,6 @@ #include "opencl/test/unit_test/mocks/mock_internal_allocation_storage.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h index 5df93b4236..f6a2d81563 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h @@ -6,9 +6,10 @@ */ #pragma once +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; struct BcsTests : public Test { void SetUp() override { diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp index 83ea530527..3f3e19cb3c 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp @@ -9,10 +9,10 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" -#include "test.h" using namespace NEO; using MatcherIsRTCapable = IsAtLeastXeHpgCore; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp index d2f481e05f..66b8a74cfb 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp @@ -24,6 +24,7 @@ #include "shared/test/common/mocks/mock_csr.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 "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -37,7 +38,6 @@ #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_scratch_space_controller_xehp_and_later.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" -#include "test.h" #include "gtest/gtest.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp index b7253b9131..4a32f896c7 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp @@ -7,9 +7,9 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp index 8e626fbdea..e19d05615c 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp @@ -9,11 +9,11 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw.h" #include "shared/source/helpers/hardware_context_controller.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_aub_stream.h" #include "opencl/test/unit_test/mocks/mock_csr_simulated_common_hw.h" -#include "test.h" using XeHPAndLaterMockSimulatedCsrHwTests = Test; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp index 6dff54b645..8c36cb57a0 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp @@ -18,10 +18,10 @@ #include "shared/test/common/mocks/mock_aub_manager.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/mocks/mock_csr_simulated_common_hw.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" -#include "test.h" #include #include diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index 0db59dbb88..8737ee9d16 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -25,13 +25,13 @@ #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_aub_manager.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/compute_mode_tests.h b/opencl/test/unit_test/command_stream/compute_mode_tests.h index 54c1e8c833..99547b01a9 100644 --- a/opencl/test/unit_test/command_stream/compute_mode_tests.h +++ b/opencl/test/unit_test/command_stream/compute_mode_tests.h @@ -11,8 +11,7 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/compute_mode_tests_dg2.cpp b/opencl/test/unit_test/command_stream/compute_mode_tests_dg2.cpp index 7de5dbe8c1..06fc282b48 100644 --- a/opencl/test/unit_test/command_stream/compute_mode_tests_dg2.cpp +++ b/opencl/test/unit_test/command_stream/compute_mode_tests_dg2.cpp @@ -11,10 +11,10 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/command_stream/compute_mode_tests.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" -#include "test.h" #include "test_traits_common.h" diff --git a/opencl/test/unit_test/command_stream/compute_mode_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/compute_mode_tests_xehp_and_later.cpp index 9b418f0ea1..0e65fa996f 100644 --- a/opencl/test/unit_test/command_stream/compute_mode_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/compute_mode_tests_xehp_and_later.cpp @@ -10,9 +10,9 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/command_stream/compute_mode_tests.h" -#include "test.h" #include "test_traits_common.h" diff --git a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp index a705f9649c..70e3412737 100644 --- a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp @@ -13,10 +13,10 @@ #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/create_command_stream.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/helpers/execution_environment_helper.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp index ad79e78991..58ae0206a3 100644 --- a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp +++ b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp @@ -12,10 +12,10 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_experimental_command_buffer.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_stream/get_devices_tests.cpp b/opencl/test/unit_test/command_stream/get_devices_tests.cpp index 8aa3768746..2530ae73a4 100644 --- a/opencl/test/unit_test/command_stream/get_devices_tests.cpp +++ b/opencl/test/unit_test/command_stream/get_devices_tests.cpp @@ -14,10 +14,10 @@ #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/create_command_stream.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" namespace NEO { bool operator==(const HardwareInfo &hwInfoIn, const HardwareInfo &hwInfoOut) { diff --git a/opencl/test/unit_test/command_stream/implicit_scaling_ocl_tests.cpp b/opencl/test/unit_test/command_stream/implicit_scaling_ocl_tests.cpp index e18ef56c89..5b540bdc34 100644 --- a/opencl/test/unit_test/command_stream/implicit_scaling_ocl_tests.cpp +++ b/opencl/test/unit_test/command_stream/implicit_scaling_ocl_tests.cpp @@ -6,8 +6,7 @@ */ #include "shared/source/command_container/implicit_scaling.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp index d28165f78a..bd4f99b4a2 100644 --- a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp +++ b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp @@ -10,13 +10,13 @@ #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp index 6bc51ef15d..760d9fdd11 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp @@ -12,9 +12,9 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp index df8536ecb7..368d52185d 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -27,6 +27,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_tbx_csr.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "opencl/source/mem_obj/buffer.h" @@ -40,7 +41,6 @@ #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include "tbx_command_stream_fixture.h" diff --git a/opencl/test/unit_test/compiler_interface/cl_compiler_interface_tests.cpp b/opencl/test/unit_test/compiler_interface/cl_compiler_interface_tests.cpp index 47dca4f706..c2c4167854 100644 --- a/opencl/test/unit_test/compiler_interface/cl_compiler_interface_tests.cpp +++ b/opencl/test/unit_test/compiler_interface/cl_compiler_interface_tests.cpp @@ -9,9 +9,9 @@ #include "shared/test/common/helpers/test_files.h" #include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_compiler_interface.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/compiler_interface/default_cl_cache_config_tests.cpp b/opencl/test/unit_test/compiler_interface/default_cl_cache_config_tests.cpp index 7d6e94a5f6..63845b620b 100644 --- a/opencl/test/unit_test/compiler_interface/default_cl_cache_config_tests.cpp +++ b/opencl/test/unit_test/compiler_interface/default_cl_cache_config_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/compiler_interface/default_cl_cache_config.h" -#include "test.h" TEST(CompilerCache, GivenDefaultClCacheConfigThenValuesAreProperlyPopulated) { auto cacheConfig = NEO::getDefaultClCompilerCacheConfig(); diff --git a/opencl/test/unit_test/context/context_multi_device_tests.cpp b/opencl/test/unit_test/context/context_multi_device_tests.cpp index 2d58cca275..969e1a4e9d 100644 --- a/opencl/test/unit_test/context/context_multi_device_tests.cpp +++ b/opencl/test/unit_test/context/context_multi_device_tests.cpp @@ -9,13 +9,13 @@ #include "shared/source/os_interface/device_factory.h" #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 "opencl/source/context/context.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/context/context_negative_tests.cpp b/opencl/test/unit_test/context/context_negative_tests.cpp index ac4f7e442e..ba40dda54f 100644 --- a/opencl/test/unit_test/context/context_negative_tests.cpp +++ b/opencl/test/unit_test/context/context_negative_tests.cpp @@ -6,12 +6,12 @@ */ #include "shared/test/common/fixtures/memory_management_fixture.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/context/context.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include "CL/cl_gl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index b74f5b872f..119bdcfb4f 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -14,6 +14,7 @@ #include "shared/test/common/mocks/mock_deferred_deleter.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/source/command_queue/command_queue.h" #include "opencl/source/context/context.inl" @@ -27,7 +28,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp b/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp index e47e31e253..d4f004610d 100644 --- a/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/utilities/arrayref.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/sharings/d3d/cl_d3d_api.h" #include "opencl/source/sharings/d3d/d3d_buffer.h" @@ -15,7 +16,6 @@ #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_d3d_objects.h" -#include "test.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp index 003a0c59ee..16ab14bc69 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" @@ -20,7 +21,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_d3d_objects.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" namespace NEO { template <> diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index 6c01d93602..8243f45f4b 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -21,6 +21,7 @@ #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 "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/platform/platform.h" @@ -29,7 +30,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/device/device_win_timers_tests.cpp b/opencl/test/unit_test/device/device_win_timers_tests.cpp index 1a74662ca4..cf06addb8d 100644 --- a/opencl/test/unit_test/device/device_win_timers_tests.cpp +++ b/opencl/test/unit_test/device/device_win_timers_tests.cpp @@ -9,10 +9,10 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_ostime.h" #include "shared/test/common/mocks/mock_wddm.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_ostime_win.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp index b056bcee6c..d56b165b06 100644 --- a/opencl/test/unit_test/device/get_device_info_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/helpers/get_info.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_driver_info.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device_info_map.h" #include "opencl/source/helpers/cl_hw_helper.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp b/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp index dcf4367189..e70e870f3e 100644 --- a/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp +++ b/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp @@ -10,9 +10,9 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.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" diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp index 368fa78b10..1d921d0a49 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -16,6 +16,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.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/cl_device/cl_device.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" @@ -23,7 +24,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/event/async_events_handler_tests.cpp b/opencl/test/unit_test/event/async_events_handler_tests.cpp index 00a16e8db0..973d714f14 100644 --- a/opencl/test/unit_test/event/async_events_handler_tests.cpp +++ b/opencl/test/unit_test/event/async_events_handler_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/helpers/timestamp_packet.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 "opencl/source/event/async_events_handler.h" @@ -15,7 +16,6 @@ #include "opencl/test/unit_test/mocks/mock_async_event_handler.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/event/event_callbacks_tests.cpp b/opencl/test/unit_test/event/event_callbacks_tests.cpp index 1093dd7438..881938d4c4 100644 --- a/opencl/test/unit_test/event/event_callbacks_tests.cpp +++ b/opencl/test/unit_test/event/event_callbacks_tests.cpp @@ -5,13 +5,14 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/event/async_events_handler.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp index 7e78ea3f01..887213e7b6 100644 --- a/opencl/test/unit_test/event/event_tests.cpp +++ b/opencl/test/unit_test/event/event_tests.cpp @@ -17,6 +17,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_ostime.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -31,7 +32,6 @@ #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/os_interface/mock_performance_counters.h" -#include "test.h" #include "event_fixture.h" diff --git a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp index 0867ca5f44..27f1663829 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -24,13 +24,13 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #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 "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/mocks/mock_async_event_handler.h" #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h index 987d7d4ed9..019df79065 100644 --- a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h +++ b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h @@ -11,12 +11,12 @@ #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_hw_parse.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/cl_preemption_fixture.cpp b/opencl/test/unit_test/fixtures/cl_preemption_fixture.cpp index 81f0cdd53e..bc66c5b4a7 100644 --- a/opencl/test/unit_test/fixtures/cl_preemption_fixture.cpp +++ b/opencl/test/unit_test/fixtures/cl_preemption_fixture.cpp @@ -11,6 +11,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/enqueue_common.h" #include "opencl/source/command_queue/enqueue_kernel.h" @@ -21,7 +22,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h index 65014992a3..cf7a35b400 100644 --- a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h +++ b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h @@ -8,9 +8,9 @@ #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" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/fixtures/d3d_test_fixture.h b/opencl/test/unit_test/fixtures/d3d_test_fixture.h index 81c65e5da4..6adecdf513 100644 --- a/opencl/test/unit_test/fixtures/d3d_test_fixture.h +++ b/opencl/test/unit_test/fixtures/d3d_test_fixture.h @@ -7,12 +7,12 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_gmm.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" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_d3d_objects.h" -#include "test.h" namespace NEO { template <> diff --git a/opencl/test/unit_test/fixtures/device_host_queue_fixture.h b/opencl/test/unit_test/fixtures/device_host_queue_fixture.h index 6ca3561fe5..7181cd9b68 100644 --- a/opencl/test/unit_test/fixtures/device_host_queue_fixture.h +++ b/opencl/test/unit_test/fixtures/device_host_queue_fixture.h @@ -6,13 +6,14 @@ */ #pragma once +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/test/unit_test/api/cl_api_tests.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h b/opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h index aa4b5a5e1c..397677b635 100644 --- a/opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h @@ -7,12 +7,13 @@ #pragma once +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/program/program_from_binary.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h index f8fc8d9f52..c4a793689c 100644 --- a/opencl/test/unit_test/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_fixture.h @@ -10,13 +10,13 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" +#include "shared/test/common/test_macros/test.h" #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/buffer_fixture.h" #include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h" #include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/image_fixture.h b/opencl/test/unit_test/fixtures/image_fixture.h index 77bde328f6..6a1a0ed9d7 100644 --- a/opencl/test/unit_test/fixtures/image_fixture.h +++ b/opencl/test/unit_test/fixtures/image_fixture.h @@ -9,6 +9,7 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/hw_info.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/image.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include "CL/cl.h" diff --git a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h index 3cc79e25d3..4171c8570c 100644 --- a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h @@ -7,8 +7,9 @@ #pragma once +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include 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 59a582ba0e..56960b3f4c 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 @@ -9,9 +9,9 @@ #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" -#include "test.h" using namespace NEO; struct clGetKernelWorkGroupInfoTest : public ApiFixture<>, diff --git a/opencl/test/unit_test/fixtures/multi_tile_fixture.h b/opencl/test/unit_test/fixtures/multi_tile_fixture.h index ebe01edeb1..ac63913887 100644 --- a/opencl/test/unit_test/fixtures/multi_tile_fixture.h +++ b/opencl/test/unit_test/fixtures/multi_tile_fixture.h @@ -10,10 +10,10 @@ #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" -#include "test.h" struct MultiTileFixture : public ::testing::Test { void SetUp() override { 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 11984be3b7..9bb5a1e22d 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,10 +7,11 @@ #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" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/scenario_test_fixture.h b/opencl/test/unit_test/fixtures/scenario_test_fixture.h index bb8774d97a..9e85c64599 100644 --- a/opencl/test/unit_test/fixtures/scenario_test_fixture.h +++ b/opencl/test/unit_test/fixtures/scenario_test_fixture.h @@ -8,11 +8,11 @@ #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" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp index 8a50cbdb9b..466e47ade5 100644 --- a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp @@ -12,8 +12,7 @@ #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_device.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp index 33cc245a3a..fe88634e64 100644 --- a/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp @@ -9,6 +9,7 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp index acc6a0d278..46896c5d97 100644 --- a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp index 85b8ccdc87..647188faf5 100644 --- a/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp @@ -6,8 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; using EhlHwInfo = ::testing::Test; diff --git a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp index 7d2147e9d0..fcc9e3a62c 100644 --- a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp @@ -5,12 +5,13 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" #include "opencl/test/unit_test/helpers/static_size3.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp index 66d08bb591..ea835b7cf5 100644 --- a/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp @@ -7,9 +7,9 @@ #include "shared/source/helpers/pipeline_select_helper.h" #include "shared/source/helpers/preamble.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" -#include "test.h" using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/gen11/icllp/excludes_icllp.cpp b/opencl/test/unit_test/gen11/icllp/excludes_icllp.cpp index 222c2fc8c1..1956e13c7d 100644 --- a/opencl/test/unit_test/gen11/icllp/excludes_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/excludes_icllp.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfAdditionalMediaSamplerProgrammingIsRequiredThenFalseIsReturned, IGFX_ICELAKE_LP) HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfInitialFlagsProgrammingIsRequiredThenFalseIsReturned, IGFX_ICELAKE_LP) diff --git a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp index 6212a81414..97c84b08cb 100644 --- a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp index 428bf4e662..db223abf53 100644 --- a/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp @@ -7,8 +7,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp index 7a36d75bdd..9b63c59e2a 100644 --- a/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp @@ -8,9 +8,9 @@ #include "shared/source/helpers/pipeline_select_helper.h" #include "shared/source/helpers/preamble.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" -#include "test.h" using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp index 5990003c7c..3952a57231 100644 --- a/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp @@ -12,8 +12,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_device.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/image_tests_gen11.cpp b/opencl/test/unit_test/gen11/image_tests_gen11.cpp index 6d51784fb3..e2d75a480d 100644 --- a/opencl/test/unit_test/gen11/image_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/image_tests_gen11.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/image/image_surface_state.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp index bc056ba1be..dded5380f7 100644 --- a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp @@ -5,10 +5,11 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp index d2a5b6960e..016c0d8c77 100644 --- a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp b/opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp index 454c2b7a03..11061cf435 100644 --- a/opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp @@ -6,8 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(LkfHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThrow) { diff --git a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp index 6ab842ffd4..f83a46bc56 100644 --- a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/os_interface/hw_info_config.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp index b961685844..b9e4041091 100644 --- a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp index 1191dadf85..950a525d05 100644 --- a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp index 95c3b16ac8..4cb6d1db0f 100644 --- a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/test_sample_gen11.cpp b/opencl/test/unit_test/gen11/test_sample_gen11.cpp index 8a4a27ae27..86e649d96e 100644 --- a/opencl/test/unit_test/gen11/test_sample_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_sample_gen11.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp b/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp index 3af107c966..baee7971f4 100644 --- a/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp @@ -6,8 +6,7 @@ */ #include "shared/source/helpers/windows/gmm_callbacks.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/adlp/excludes_adlp.cpp b/opencl/test/unit_test/gen12lp/adlp/excludes_adlp.cpp index f89994ebaf..d5bd6cbb12 100644 --- a/opencl/test/unit_test/gen12lp/adlp/excludes_adlp.cpp +++ b/opencl/test/unit_test/gen12lp/adlp/excludes_adlp.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_ALDERLAKE_P) HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_ALDERLAKE_P); diff --git a/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp b/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp index 73d9258caa..bfa6eedef5 100644 --- a/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp +++ b/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp b/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp index 30a2a5605d..2e4fbff9ab 100644 --- a/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp +++ b/opencl/test/unit_test/gen12lp/adls/excludes_adls.cpp @@ -5,6 +5,6 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ALDERLAKE_S); diff --git a/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp b/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp index d8bc1cc456..ce17bca13d 100644 --- a/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp +++ b/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl index d1e18fbe16..6e671f99a3 100644 --- a/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl @@ -13,10 +13,10 @@ #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/buffer_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/buffer_tests_gen12lp.inl index b1382f6f5d..e1885cb0ab 100644 --- a/opencl/test/unit_test/gen12lp/buffer_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/buffer_tests_gen12lp.inl @@ -9,12 +9,12 @@ #include "shared/source/gmm_helper/gmm_helper.h" #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/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl index 6167b4d0d5..1845c38153 100644 --- a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl @@ -12,8 +12,7 @@ #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h" #include "shared/test/common/mocks/mock_device.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl index b7b30498ee..f2325d99cf 100644 --- a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl @@ -10,6 +10,7 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl index dd84c02503..c6fe0e50c5 100644 --- a/opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl @@ -7,11 +7,11 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_hw.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_aub_stream.h" #include "opencl/test/unit_test/mocks/mock_csr_simulated_common_hw.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/dg1/excludes_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/excludes_dg1.cpp index d2a562abae..b5e8fa9cca 100644 --- a/opencl/test/unit_test/gen12lp/dg1/excludes_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/excludes_dg1.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_DG1) HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_DG1); diff --git a/opencl/test/unit_test/gen12lp/dg1/execution_environment_tests_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/execution_environment_tests_dg1.cpp index 3c0ed99978..66e306a777 100644 --- a/opencl/test/unit_test/gen12lp/dg1/execution_environment_tests_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/execution_environment_tests_dg1.cpp @@ -8,10 +8,9 @@ #include "shared/source/ail/ail_configuration.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/destructor_counted.h" -#include "test.h" - namespace NEO { using RootDeviceEnvironmentTests = ::testing::Test; diff --git a/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp index 1b4c061493..cad3ef0013 100644 --- a/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp @@ -8,9 +8,9 @@ #include "shared/source/helpers/hw_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/helpers/gtest_helpers.h" -#include "test.h" using namespace NEO; template diff --git a/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp index 91db831fac..964101c909 100644 --- a/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/os_interface/driver_info.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp index 1da24831df..60135709cd 100644 --- a/opencl/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp @@ -8,9 +8,9 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/hardware_commands_helper.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl b/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl index 9f90a7ac61..b983925894 100644 --- a/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" -#include "test.h" using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/gen12lp/excludes_gen12lp.cpp b/opencl/test/unit_test/gen12lp/excludes_gen12lp.cpp index b40792a953..1d1efca777 100644 --- a/opencl/test/unit_test/gen12lp/excludes_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/excludes_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueBlockedWithProfilingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_GEN12LP_CORE); HWTEST_EXCLUDE_PRODUCT(ProfilingTests, GivenCommandQueueWithProflingWhenWalkerIsDispatchedThenMiStoreRegisterMemIsPresentInCS, IGFX_GEN12LP_CORE); diff --git a/opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp index 464e6a3dd9..822f432f3d 100644 --- a/opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp @@ -8,13 +8,13 @@ #include "shared/source/gen12lp/hw_info.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/fixtures/linear_stream_fixture.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" namespace NEO { struct GpgpuWalkerTests : public ::testing::Test { diff --git a/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl index 96d70487d1..5af6d44d7b 100644 --- a/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl @@ -13,11 +13,11 @@ #include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl index 960fce4505..4c0dde7281 100644 --- a/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl @@ -5,11 +5,12 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl index 2774f820a1..e340adcd9b 100644 --- a/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl @@ -5,11 +5,12 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_common.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp index c6de5ca672..013e82be7f 100644 --- a/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp +++ b/opencl/test/unit_test/gen12lp/rkl/excludes_rkl.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ROCKETLAKE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_ROCKETLAKE) diff --git a/opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp index 6008daff39..2d6c3f4851 100644 --- a/opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp +++ b/opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp @@ -8,8 +8,7 @@ #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" #include diff --git a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl index 471953c519..2264d391dc 100644 --- a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl @@ -8,9 +8,9 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #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/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl index aee60f2b18..8b5a7b4fc1 100644 --- a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl @@ -8,9 +8,9 @@ #include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl index e6251b7a34..4fbbe18360 100644 --- a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl index 8efdd2f0a0..443517e537 100644 --- a/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl @@ -1,12 +1,13 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl index fd3e6140ee..c0d491e1c5 100644 --- a/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/tgllp/buffer_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/buffer_tests_tgllp.cpp index ff0092a237..436e036bbd 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/buffer_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/buffer_tests_tgllp.cpp @@ -8,11 +8,11 @@ #include "shared/source/device/device.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/tgllp/excludes_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/excludes_tgllp.cpp index 4c9e588049..be52dae0f5 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/excludes_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/excludes_tgllp.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_TIGERLAKE_LP) HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_TIGERLAKE_LP); diff --git a/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp index f3927e2fcb..a847d27f27 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp @@ -7,11 +7,11 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp index 3bcacf52da..a1a9a1dee0 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp @@ -9,8 +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/mocks/mock_execution_environment.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp index 16058f38c3..ad408ae234 100644 --- a/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp @@ -16,11 +16,11 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp index 5e7db0ac13..4042f241c0 100644 --- a/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp @@ -13,8 +13,7 @@ #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/mocks/windows/mock_gmm_memory_base.h" #include "shared/test/common/os_interface/windows/gdi_dll_fixture.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp b/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp index 287232ee65..75a32522d6 100644 --- a/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp b/opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp index 4b21824e31..10dd843935 100644 --- a/opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp @@ -7,8 +7,7 @@ #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(BdwHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThrow) { diff --git a/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp b/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp index 149f599381..4f04fc1fc3 100644 --- a/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp +++ b/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp b/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp index a626f1a3ba..4b124fced1 100644 --- a/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp @@ -9,10 +9,10 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/dispatch_flags_helper.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" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp index 6d10faaf4d..bcb7a8b0ff 100644 --- a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp b/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp index e68caf955d..e2d847bcd1 100644 --- a/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp +++ b/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp @@ -6,9 +6,9 @@ */ #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/image_tests_gen8.cpp b/opencl/test/unit_test/gen8/image_tests_gen8.cpp index 02686761c4..e7b6bfc567 100644 --- a/opencl/test/unit_test/gen8/image_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/image_tests_gen8.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp index d00983f236..d97c1fba1c 100644 --- a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp @@ -1,14 +1,15 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/sampler_tests_gen8.cpp b/opencl/test/unit_test/gen8/sampler_tests_gen8.cpp index ca0398cb1a..d57374095e 100644 --- a/opencl/test/unit_test/gen8/sampler_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/sampler_tests_gen8.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/os_interface/hw_info_config.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp index 9e491a949d..2002f445a8 100644 --- a/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp index e7c0fe5589..4e8554123a 100644 --- a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/test_sample_gen8.cpp b/opencl/test/unit_test/gen8/test_sample_gen8.cpp index c777c53106..0e9d281eb7 100644 --- a/opencl/test/unit_test/gen8/test_sample_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_sample_gen8.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp b/opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp index 52ea8fa2d3..6544380e57 100644 --- a/opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp @@ -1,13 +1,12 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/windows/gmm_callbacks.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp index 43f9706648..09278f70f3 100644 --- a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp index 32311e06b8..77797122f2 100644 --- a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp index 6bf702c3ce..7d4bbbcd79 100644 --- a/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp @@ -6,8 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(BxtHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThrow) { diff --git a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp index c7ca8864d6..2481a3aad8 100644 --- a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp +++ b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp index 6b12eb08ad..ac8db9d1f5 100644 --- a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp index d17f142b74..92bc8fe988 100644 --- a/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp @@ -6,8 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(CflHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { diff --git a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp index ab0a457aa0..396c3e21c9 100644 --- a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp +++ b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp index 6901edc508..5b35a00f5e 100644 --- a/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp @@ -9,10 +9,10 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/dispatch_flags_helper.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" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp index fc92a4dbf2..712b5a3cb1 100644 --- a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" @@ -21,7 +22,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp index e04e41f169..c6269beb15 100644 --- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp @@ -7,13 +7,13 @@ #include "shared/source/gen9/reg_configs.h" #include "shared/test/common/fixtures/memory_management_fixture.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" #include "opencl/test/unit_test/helpers/static_size3.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp index 95a1cbeda7..5d435b7305 100644 --- a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp @@ -7,9 +7,9 @@ #include "shared/source/helpers/preamble.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" -#include "test.h" using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp index f5614c2ca6..b59814c60c 100644 --- a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp b/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp index cad6cc1c9f..3109d90874 100644 --- a/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp @@ -6,8 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(GlkHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { diff --git a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp index 21e5993f07..eeeaa5bd32 100644 --- a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp +++ b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/image_tests_gen9.cpp b/opencl/test/unit_test/gen9/image_tests_gen9.cpp index e26f6b2a89..446411cdc5 100644 --- a/opencl/test/unit_test/gen9/image_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/image_tests_gen9.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp index 6926e2801e..b6284e01a7 100644 --- a/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp index 7aed83b324..c53824fbeb 100644 --- a/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp @@ -6,8 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(KblHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { diff --git a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp index 15fbbfeebc..54cebc9295 100644 --- a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp +++ b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp index 504ca9a0ea..10053c4287 100644 --- a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp @@ -5,11 +5,12 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp index e7f1ace1a8..a92d9ac87d 100644 --- a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/os_interface/hw_info_config.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp index a1f9b1b2b2..8a04b1e7e1 100644 --- a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp @@ -10,8 +10,7 @@ #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 "test.h" +#include "shared/test/common/test_macros/test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp index a3ddd9a267..c60f8418cc 100644 --- a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp index 5753267184..bf0f45c2e6 100644 --- a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp index 93ceea935b..c0d9e03035 100644 --- a/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp @@ -6,8 +6,7 @@ */ #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; TEST(SklHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { diff --git a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp index dd313a14d0..2521e0ef3c 100644 --- a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp index c644114648..b5df040ed9 100644 --- a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp +++ b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp @@ -1,12 +1,13 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp index da98b0b58e..b5909b35fb 100644 --- a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp index 2f40978846..0ce68921f4 100644 --- a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/test_sample_gen9.cpp b/opencl/test/unit_test/gen9/test_sample_gen9.cpp index c7126f2b76..c075269bb3 100644 --- a/opencl/test/unit_test/gen9/test_sample_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_sample_gen9.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp b/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp index 7879c20d1e..db89110fbb 100644 --- a/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp @@ -1,13 +1,12 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/windows/gmm_callbacks.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp index 056beff63a..5eaf6c3c40 100644 --- a/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp +++ b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp @@ -6,8 +6,7 @@ */ #include "shared/source/helpers/hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" #include diff --git a/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp index 6ba5bb3f73..522479967f 100644 --- a/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp +++ b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(ExcludeTestBdw, givenHwCmdTestWhenBdwExcludedThenDontRunOnBdw, IGFX_BROADWELL); HWTEST_EXCLUDE_PRODUCT(ExcludeTestBdw, givenHwTestWhenBdwExcludedThenDontRunOnBdw, IGFX_BROADWELL); diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp index 184a6f17e8..8753a79f2c 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -24,11 +24,11 @@ #include "shared/test/common/mocks/mock_gmm_client_context.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include "GL/gl.h" #include "GL/glext.h" diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index b237aece2d..51e9e0ee03 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -20,6 +20,7 @@ #include "shared/test/common/helpers/variable_backup.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 "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" @@ -45,7 +46,6 @@ #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/program/program_tests.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp index 6df90ecc65..9bb8083979 100644 --- a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp @@ -7,9 +7,9 @@ #include "shared/source/aub/aub_helper.h" #include "shared/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp b/opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp index 937fbd6f62..228fa682d2 100644 --- a/opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp +++ b/opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp @@ -6,9 +6,9 @@ */ #include "shared/test/common/cmd_parse/hw_parse.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/helpers/cmd_buffer_validator.h" -#include "test.h" using HwParseTest = ::testing::Test; diff --git a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp index 60df8364ae..c1d1255c0a 100644 --- a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp +++ b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp @@ -5,12 +5,13 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/helpers/dispatch_info_builder.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/dispatch_info_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_tests.cpp index c8ca52405c..7482eeee95 100644 --- a/opencl/test/unit_test/helpers/dispatch_info_tests.cpp +++ b/opencl/test/unit_test/helpers/dispatch_info_tests.cpp @@ -5,12 +5,13 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp index 39de03e4d5..5b81c64fe4 100644 --- a/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp @@ -7,9 +7,9 @@ #include "shared/source/helpers/engine_node_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; 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 14b2d57d20..a9aa5ed76f 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h @@ -8,6 +8,7 @@ #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" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp b/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp index bc3d35ec70..ceaabffef2 100644 --- a/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp +++ b/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp @@ -7,9 +7,9 @@ #include "shared/source/helpers/heap_assigner.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp index 162bdd6052..7a52381566 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp @@ -11,9 +11,9 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include "pipe_control_args.h" diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp index 8456390413..0974ef24aa 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp index 7a8b8ae551..a857181b2d 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp @@ -10,8 +10,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/hw_helper_tests.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using HwHelperTestPvcAndLater = HwHelperTest; diff --git a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp index 3c49ab6730..1e34748add 100644 --- a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp +++ b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp @@ -8,12 +8,12 @@ #include "shared/source/os_interface/os_context.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 "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp b/opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp index b3f97207cd..660153e1c6 100644 --- a/opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp +++ b/opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp @@ -7,8 +7,7 @@ #include "shared/source/helpers/kmd_notify_properties.h" #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp index 980dc2bd15..ad176d5330 100644 --- a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp +++ b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp @@ -11,10 +11,10 @@ #include "shared/source/helpers/per_thread_data.h" #include "shared/source/program/kernel_info.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "patch_shared.h" diff --git a/opencl/test/unit_test/helpers/ray_tracing_helper_tests.cpp b/opencl/test/unit_test/helpers/ray_tracing_helper_tests.cpp index 6a411cba29..ccabfb25e2 100644 --- a/opencl/test/unit_test/helpers/ray_tracing_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/ray_tracing_helper_tests.cpp @@ -8,10 +8,10 @@ #include "shared/source/helpers/constants.h" #include "shared/source/helpers/ray_tracing_helper.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/task_information_tests.cpp b/opencl/test/unit_test/helpers/task_information_tests.cpp index 5ff8a06752..06a636a735 100644 --- a/opencl/test/unit_test/helpers/task_information_tests.cpp +++ b/opencl/test/unit_test/helpers/task_information_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/task_information.h" @@ -15,7 +16,6 @@ #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/helpers/test_preamble_dg2_and_later.cpp b/opencl/test/unit_test/helpers/test_preamble_dg2_and_later.cpp index b39d8e5484..4f9bb383b9 100644 --- a/opencl/test/unit_test/helpers/test_preamble_dg2_and_later.cpp +++ b/opencl/test/unit_test/helpers/test_preamble_dg2_and_later.cpp @@ -9,10 +9,10 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #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/test.h" #include "shared/test/unit_test/preamble/preamble_fixture.h" #include "opencl/source/helpers/hardware_commands_helper.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/timestamp_packet_tests.h b/opencl/test/unit_test/helpers/timestamp_packet_tests.h index 2b8831ad97..f1712c450f 100644 --- a/opencl/test/unit_test/helpers/timestamp_packet_tests.h +++ b/opencl/test/unit_test/helpers/timestamp_packet_tests.h @@ -9,13 +9,13 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp b/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp index 1bc8f6b3d0..84d618497a 100644 --- a/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #include "shared/source/os_interface/os_library.h" #include "shared/source/os_interface/windows/windows_wrapper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/windows/gl_helper.h" #include "opencl/test/unit_test/helpers/windows/mock_function.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp b/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp index 50ca36f322..4b18a1aa05 100644 --- a/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp +++ b/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp @@ -9,8 +9,7 @@ #include "shared/source/os_interface/windows/sys_calls.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" namespace NEO { diff --git a/opencl/test/unit_test/igdrcl_tests_pch.h b/opencl/test/unit_test/igdrcl_tests_pch.h index 7f4f8f51d5..884230ddc7 100644 --- a/opencl/test/unit_test/igdrcl_tests_pch.h +++ b/opencl/test/unit_test/igdrcl_tests_pch.h @@ -15,8 +15,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/sku_info/sku_info_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" #include "hw_cmds.h" #include "third_party/opencl_headers/CL/cl.h" diff --git a/opencl/test/unit_test/kernel/cache_flush_tests.inl b/opencl/test/unit_test/kernel/cache_flush_tests.inl index b37dae24ee..45ebab5c48 100644 --- a/opencl/test/unit_test/kernel/cache_flush_tests.inl +++ b/opencl/test/unit_test/kernel/cache_flush_tests.inl @@ -14,6 +14,7 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_allocation_properties.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" @@ -24,7 +25,6 @@ #include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h" #include "opencl/test/unit_test/helpers/static_size3.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl b/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl index 3f53d92133..cf603f49c7 100644 --- a/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl +++ b/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl @@ -10,13 +10,13 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_allocation_properties.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/helpers/cmd_buffer_validator.h" #include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h" #include "opencl/test/unit_test/helpers/static_size3.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/clone_kernel_tests.cpp b/opencl/test/unit_test/kernel/clone_kernel_tests.cpp index bd66f6ac59..152f291f4b 100644 --- a/opencl/test/unit_test/kernel/clone_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/clone_kernel_tests.cpp @@ -6,6 +6,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 "opencl/source/accelerators/intel_accelerator.h" @@ -24,7 +25,6 @@ #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/mocks/mock_sampler.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "CL/cl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/kernel/debug_kernel_tests.cpp b/opencl/test/unit_test/kernel/debug_kernel_tests.cpp index 509628444e..8c5f0dd10b 100644 --- a/opencl/test/unit_test/kernel/debug_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/debug_kernel_tests.cpp @@ -6,11 +6,11 @@ */ #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp index 7fa756c870..0584a7959c 100644 --- a/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/test/common/fixtures/memory_management_fixture.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "CL/cl.h" #include "config.h" diff --git a/opencl/test/unit_test/kernel/image_transformer_tests.cpp b/opencl/test/unit_test/kernel/image_transformer_tests.cpp index 2eb4fb72d6..2e117eb874 100644 --- a/opencl/test/unit_test/kernel/image_transformer_tests.cpp +++ b/opencl/test/unit_test/kernel/image_transformer_tests.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/program/kernel_info.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/image_transformer.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel_info.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp index 1f23d6de2e..7d4e55eec0 100644 --- a/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp @@ -5,6 +5,8 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/accelerators/intel_accelerator.h" #include "opencl/source/accelerators/intel_motion_estimation.h" #include "opencl/source/kernel/kernel.h" @@ -15,7 +17,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "CL/cl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp index 9f07316b86..f945e94f84 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp @@ -8,6 +8,7 @@ #include "kernel_arg_buffer_fixture.h" #include "shared/source/helpers/api_specific_config.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "CL/cl.h" #include "gtest/gtest.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 73ff036198..f26c7b30dd 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h @@ -6,6 +6,8 @@ */ #pragma once +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -14,7 +16,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "CL/cl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp index e6305c275d..f6cda1b6ac 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/unified_memory/unified_memory.h" #include "shared/test/common/fixtures/memory_management_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" @@ -20,7 +21,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h" -#include "test.h" #include "CL/cl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp index a36ff73700..e2be0e8b11 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp @@ -7,6 +7,7 @@ #include "shared/test/common/fixtures/memory_management_fixture.h" #include "shared/test/common/helpers/kernel_binary_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/program/program_tests.h" #include "opencl/test/unit_test/program/program_with_source.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp index 308a25c42f..0e6f730ec5 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp @@ -5,6 +5,8 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/pipe.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -14,7 +16,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_pipe.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "CL/cl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp index 7158c919e8..9688e6c750 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp @@ -5,6 +5,8 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -13,7 +15,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "CL/cl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp index 5e6ac3ea6e..513dd99def 100644 --- a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp @@ -8,6 +8,7 @@ #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 "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp index fd1fdbd44f..c4cd702c67 100644 --- a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/kernel/kernel.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/mocks/mock_image.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "gtest/gtest.h" #include "hw_cmds.h" diff --git a/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp index 12f54802e1..40186d8c4b 100644 --- a/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp @@ -5,12 +5,13 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "CL/cl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp index 776c844e0e..8271ab14f9 100644 --- a/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp @@ -7,13 +7,13 @@ #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp index 7d0a18c526..4a08e6490c 100644 --- a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/program/kernel_info.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 0d7377f8c9..b811942bb4 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -22,6 +22,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.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" @@ -44,7 +45,6 @@ #include "opencl/test/unit_test/program/program_from_binary.h" #include "opencl/test/unit_test/program/program_tests.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_tests_pvc_and_later.cpp b/opencl/test/unit_test/kernel/kernel_tests_pvc_and_later.cpp index 95456a047c..27509d05ed 100644 --- a/opencl/test/unit_test/kernel/kernel_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests_pvc_and_later.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_transformable_tests.cpp b/opencl/test/unit_test/kernel/kernel_transformable_tests.cpp index 4ed9ffb276..9d8ac58629 100644 --- a/opencl/test/unit_test/kernel/kernel_transformable_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_transformable_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/program/kernel_info.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/sampler/sampler.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" @@ -13,7 +14,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_sampler.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/kernel/parent_kernel_tests.cpp b/opencl/test/unit_test/kernel/parent_kernel_tests.cpp index 72c185a128..9f1bab6101 100644 --- a/opencl/test/unit_test/kernel/parent_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/parent_kernel_tests.cpp @@ -6,11 +6,11 @@ */ #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp index 66b05e79ea..197f459a94 100644 --- a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp +++ b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp @@ -8,10 +8,10 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/os_context.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/linux/drm_null_device_tests.cpp b/opencl/test/unit_test/linux/drm_null_device_tests.cpp index 2e6169fdd5..a406baf6e5 100644 --- a/opencl/test/unit_test/linux/drm_null_device_tests.cpp +++ b/opencl/test/unit_test/linux/drm_null_device_tests.cpp @@ -8,10 +8,10 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/os_interface/linux/drm_null_device.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/linux/drm_wrap.h" #include "opencl/test/unit_test/linux/mock_os_layer.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp index a13e932b61..728168c800 100644 --- a/opencl/test/unit_test/linux/main_linux_dll.cpp +++ b/opencl/test/unit_test/linux/main_linux_dll.cpp @@ -21,12 +21,12 @@ #include "shared/test/common/helpers/variable_backup.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/command_queue/command_queue.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/linux/drm_wrap.h" #include "opencl/test/unit_test/linux/mock_os_layer.h" -#include "test.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/linux/os_interface_linux_tests.cpp b/opencl/test/unit_test/linux/os_interface_linux_tests.cpp index adfab554e6..9cebcea1f1 100644 --- a/opencl/test/unit_test/linux/os_interface_linux_tests.cpp +++ b/opencl/test/unit_test/linux/os_interface_linux_tests.cpp @@ -11,9 +11,9 @@ #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" #include "opencl/test/unit_test/linux/mock_os_layer.h" -#include "test.h" namespace NEO { extern GMM_INIT_IN_ARGS passedInputArgs; diff --git a/opencl/test/unit_test/linux/va_tests.cpp b/opencl/test/unit_test/linux/va_tests.cpp index 5ea2b7291f..32d25926d8 100644 --- a/opencl/test/unit_test/linux/va_tests.cpp +++ b/opencl/test/unit_test/linux/va_tests.cpp @@ -6,11 +6,11 @@ */ #include "shared/test/common/helpers/variable_backup.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/sharings/va/va_device.h" #include "opencl/source/sharings/va/va_sharing_functions.h" #include "opencl/test/unit_test/linux/mock_os_layer.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp index 8e46f3c81b..a39a4586c6 100644 --- a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/api/api.h" @@ -24,7 +25,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp index 2c3ca28bd1..c64016a106 100644 --- a/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp @@ -9,12 +9,12 @@ #include "shared/test/common/fixtures/memory_management_fixture.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_memory_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" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp index 5513ccc3da..73f36e47f9 100644 --- a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp @@ -11,6 +11,7 @@ #include "shared/source/memory_manager/surface.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" @@ -19,7 +20,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index 7d9d87077b..95b8ecbe53 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -19,6 +19,7 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/matchers.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -27,7 +28,6 @@ #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp b/opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp index 5d67f3cfb0..f8e88962d3 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests_pvc_and_later.cpp @@ -9,6 +9,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/extensions/public/cl_ext_private.h" @@ -18,7 +19,6 @@ #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_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp index 2b554af2db..c8ce20778f 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp @@ -16,6 +16,7 @@ #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" @@ -23,7 +24,6 @@ #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/mem_obj/create_image_in_local_memory_tests.cpp b/opencl/test/unit_test/mem_obj/create_image_in_local_memory_tests.cpp index e97d1f26a4..36855cb86c 100644 --- a/opencl/test/unit_test/mem_obj/create_image_in_local_memory_tests.cpp +++ b/opencl/test/unit_test/mem_obj/create_image_in_local_memory_tests.cpp @@ -10,6 +10,7 @@ #include "shared/source/memory_manager/memory_pool.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/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/image.h" @@ -17,7 +18,6 @@ #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_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp b/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp index f5da1ce14f..7f188b4b4d 100644 --- a/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp +++ b/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp @@ -6,10 +6,10 @@ */ #include "shared/test/common/fixtures/memory_management_fixture.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mem_obj/image1d_tests.cpp b/opencl/test/unit_test/mem_obj/image1d_tests.cpp index b37dc4f41e..3176261e90 100644 --- a/opencl/test/unit_test/mem_obj/image1d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image1d_tests.cpp @@ -5,12 +5,13 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp index 645c1fa58d..303b9d187a 100644 --- a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device_info_map.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/helpers/raii_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image2d_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_tests.cpp index 138489c682..7d30e2157a 100644 --- a/opencl/test/unit_test/mem_obj/image2d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_tests.cpp @@ -6,12 +6,12 @@ */ #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image3d_tests.cpp b/opencl/test/unit_test/mem_obj/image3d_tests.cpp index 2143ae3d09..db7072c36d 100644 --- a/opencl/test/unit_test/mem_obj/image3d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image3d_tests.cpp @@ -8,12 +8,12 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp index 8fbdd5c423..85774e5f41 100644 --- a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp @@ -7,12 +7,12 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_compression_fixture.h b/opencl/test/unit_test/mem_obj/image_compression_fixture.h index fee0efb470..9fd88b1ed5 100644 --- a/opencl/test/unit_test/mem_obj/image_compression_fixture.h +++ b/opencl/test/unit_test/mem_obj/image_compression_fixture.h @@ -7,12 +7,12 @@ #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 "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp b/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp index 447e1a462f..45ba341466 100644 --- a/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp @@ -6,13 +6,13 @@ */ #include "shared/source/helpers/aligned_memory.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" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp b/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp index 994ceff897..86fa1dc8c9 100644 --- a/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp index 18c660b623..6842e7c11f 100644 --- a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp @@ -16,6 +16,7 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" @@ -24,7 +25,6 @@ #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp index b09326386c..287a7df7ff 100644 --- a/opencl/test/unit_test/mem_obj/image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests.cpp @@ -17,6 +17,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/helpers/mipmap.h" @@ -29,7 +30,6 @@ #include "opencl/test/unit_test/mem_obj/image_compression_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp index d848629c17..deeec54008 100644 --- a/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests_pvc_and_later.cpp @@ -7,13 +7,13 @@ #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/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/api/api.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_image.h" -#include "test.h" namespace NEO { extern ImageFactoryFuncs imageFactory[IGFX_MAX_CORE]; diff --git a/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp index 57ae97dc4f..47ddfe9423 100644 --- a/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp @@ -5,11 +5,12 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp index ccf4df9fd8..0f084ff305 100644 --- a/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp @@ -15,12 +15,12 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_gmm_client_context.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mem_obj/image_compression_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include "test_traits_common.h" diff --git a/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp b/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp index 43cd3018c4..8aa062ac9c 100644 --- a/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp +++ b/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/helpers/ptr_math.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/map_operations_handler.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp index 394005178c..6bcaa10df1 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.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/source/api/api.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" @@ -20,7 +21,6 @@ #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_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp index b5121c9213..5be79648b9 100644 --- a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/kernel_binary_helper.h" #include "shared/test/common/mocks/mock_gmm_resource_info.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device_get_cap.inl" #include "opencl/source/helpers/cl_memory_properties_helpers.h" @@ -21,7 +22,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp b/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp index 62aefe556f..559f6906b1 100644 --- a/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/helpers/aligned_memory.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/helpers/cl_validators.h" @@ -15,7 +16,6 @@ #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mem_obj/pipe_tests.cpp b/opencl/test/unit_test/mem_obj/pipe_tests.cpp index 8a2879d4e2..e8892cad38 100644 --- a/opencl/test/unit_test/mem_obj/pipe_tests.cpp +++ b/opencl/test/unit_test/mem_obj/pipe_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/test/common/fixtures/memory_management_fixture.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/mem_obj/pipe.h" @@ -13,7 +14,6 @@ #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp b/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp index 52e45934e0..5e0797d14f 100644 --- a/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp @@ -15,10 +15,10 @@ #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_host_ptr_manager.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/memory_manager_fixture.h" #include "opencl/test/unit_test/mocks/mock_internal_allocation_storage.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp b/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp index aaf6033506..90976056f8 100644 --- a/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp +++ b/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp @@ -11,10 +11,10 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #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.h" #include "shared/test/unit_test/utilities/containers_tests_helpers.h" #include "opencl/test/unit_test/fixtures/memory_allocator_fixture.h" -#include "test.h" struct InternalAllocationStorageTest : public MemoryAllocatorFixture, public ::testing::Test { diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp index 2194082039..139568e640 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp @@ -15,13 +15,13 @@ #include "shared/test/common/mocks/mock_gmm.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/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.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/ult_cl_device_factory.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp index 1e1097a96f..ee13cee2bf 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp @@ -18,11 +18,11 @@ #include "shared/test/common/mocks/mock_graphics_allocation.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/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp index 7a1a9284c8..6da111ec57 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp @@ -9,9 +9,9 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp index bb049b74ad..d1ac4fcd3e 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -30,6 +30,7 @@ #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/compiler_interface/linker_mock.h" #include "opencl/source/event/event.h" @@ -51,7 +52,6 @@ #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include #include diff --git a/opencl/test/unit_test/memory_manager/migraton_controller_tests.cpp b/opencl/test/unit_test/memory_manager/migraton_controller_tests.cpp index 3f07b9cee6..9e33473ec9 100644 --- a/opencl/test/unit_test/memory_manager/migraton_controller_tests.cpp +++ b/opencl/test/unit_test/memory_manager/migraton_controller_tests.cpp @@ -10,13 +10,13 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_migration_sync_data.h" #include "shared/test/common/mocks/mock_multi_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/memory_manager/migration_controller.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/storage_info_tests.cpp b/opencl/test/unit_test/memory_manager/storage_info_tests.cpp index cb947d2f34..86b62ddb84 100644 --- a/opencl/test/unit_test/memory_manager/storage_info_tests.cpp +++ b/opencl/test/unit_test/memory_manager/storage_info_tests.cpp @@ -17,9 +17,9 @@ #include "shared/test/common/mocks/mock_graphics_allocation.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/cl_device/cl_device.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/surface_tests.cpp b/opencl/test/unit_test/memory_manager/surface_tests.cpp index ea68f7d8f3..7ae464b49b 100644 --- a/opencl/test/unit_test/memory_manager/surface_tests.cpp +++ b/opencl/test/unit_test/memory_manager/surface_tests.cpp @@ -10,12 +10,12 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/memory_manager/mem_obj_surface.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index 3c0a3c8585..e52d455089 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_svm_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h" #include "opencl/source/api/api.h" @@ -26,7 +27,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl index 9b87486c4a..ac6f1a50bc 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl @@ -1,13 +1,14 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl index d761fb1d03..aa992a0bda 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl index b9696deb27..3ef54ca220 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl @@ -1,13 +1,14 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl index b380b8cd96..dddfd9362d 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl @@ -6,13 +6,13 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/tracing/tracing_api.h" #include "opencl/source/tracing/tracing_notify.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/helpers/ult_limits.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp b/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp index c837530ab5..f8b2e43ad7 100644 --- a/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp +++ b/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp @@ -6,13 +6,13 @@ */ #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/device_queue_matcher.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_device_queue.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/offline_compiler/gen12lp/rkl/offline_compiler_tests_rkl.cpp b/opencl/test/unit_test/offline_compiler/gen12lp/rkl/offline_compiler_tests_rkl.cpp index 082667efe3..2550a0e337 100644 --- a/opencl/test/unit_test/offline_compiler/gen12lp/rkl/offline_compiler_tests_rkl.cpp +++ b/opencl/test/unit_test/offline_compiler/gen12lp/rkl/offline_compiler_tests_rkl.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/compiler_interface/compiler_options/compiler_options.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h" #include "opencl/test/unit_test/offline_compiler/offline_compiler_tests.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/offline_compiler/gen8/bdw/offline_compiler_tests_bdw.cpp b/opencl/test/unit_test/offline_compiler/gen8/bdw/offline_compiler_tests_bdw.cpp index 800f8b6d65..7466837e34 100644 --- a/opencl/test/unit_test/offline_compiler/gen8/bdw/offline_compiler_tests_bdw.cpp +++ b/opencl/test/unit_test/offline_compiler/gen8/bdw/offline_compiler_tests_bdw.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/compiler_interface/compiler_options/compiler_options.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h" #include "opencl/test/unit_test/offline_compiler/offline_compiler_tests.h" -#include "test.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/offline_compiler/gen9/skl/offline_compiler_tests_skl.cpp b/opencl/test/unit_test/offline_compiler/gen9/skl/offline_compiler_tests_skl.cpp index c676880965..5320854845 100644 --- a/opencl/test/unit_test/offline_compiler/gen9/skl/offline_compiler_tests_skl.cpp +++ b/opencl/test/unit_test/offline_compiler/gen9/skl/offline_compiler_tests_skl.cpp @@ -8,10 +8,10 @@ #include "shared/source/compiler_interface/compiler_options/compiler_options.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h" #include "opencl/test/unit_test/offline_compiler/offline_compiler_tests.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/device_factory_tests.cpp index 46fb748ef3..218c774260 100644 --- a/opencl/test/unit_test/os_interface/device_factory_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.h b/opencl/test/unit_test/os_interface/hw_info_config_tests.h index 909858304a..4b4937e746 100644 --- a/opencl/test/unit_test/os_interface/hw_info_config_tests.h +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/debug_env_reader.cpp b/opencl/test/unit_test/os_interface/linux/debug_env_reader.cpp index 688f85eb6f..594fc45e1e 100644 --- a/opencl/test/unit_test/os_interface/linux/debug_env_reader.cpp +++ b/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 #include diff --git a/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp index 22e988cc6a..69a1d69caf 100644 --- a/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/device_factory_tests.h b/opencl/test/unit_test/os_interface/linux/device_factory_tests.h index 9fce624d89..a2e6e97b14 100644 --- a/opencl/test/unit_test/os_interface/linux/device_factory_tests.h +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp index 3837427960..c19f9469bb 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h b/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h index d042ec7fad..e13e592fa8 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp index 9629f3f894..1251d35bf7 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp index ac08f70234..f38a200aac 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp index f47fe3552d..66bee74d61 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp index d6e8710ec7..8039dac0cb 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_mapper_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_mapper_tests.cpp index 8c81d9b8e5..c3618b6093 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_mapper_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp index 0bcda04d1c..f3d951dfc6 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_localmem_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_localmem_tests.cpp index e893582f42..0a8e6c7b04 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_localmem_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index cbb7d1375d..1ddd523d75 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp index 47b874c9e9..3a7720db0f 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp +++ b/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 diff --git a/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp index 7b12a4ad98..0f9cc37c55 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp +++ b/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 { diff --git a/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp index 5e4360cec4..ca4b9c3417 100644 --- a/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp b/opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp index 2391a15dc2..3d9cf4e97c 100644 --- a/opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_dg1.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp b/opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp index ad713594c3..667c0c3e75 100644 --- a/opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp b/opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp index 7c15fdfc0c..5e5e839c5a 100644 --- a/opencl/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp index 82ec37a64b..5d1d54fed2 100644 --- a/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/linux/os_time_test.cpp b/opencl/test/unit_test/os_interface/linux/os_time_test.cpp index 19b276563c..af5b13c57d 100644 --- a/opencl/test/unit_test/os_interface/linux/os_time_test.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/linux/prelim_helper_func.cpp b/opencl/test/unit_test/os_interface/linux/prelim_helper_func.cpp index bf78ec387a..c98d045141 100644 --- a/opencl/test/unit_test/os_interface/linux/prelim_helper_func.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/os_library_tests.cpp b/opencl/test/unit_test/os_interface/os_library_tests.cpp index ae352b141e..a4a69c06ff 100644 --- a/opencl/test/unit_test/os_interface/os_library_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/performance_counters_gen_tests.cpp b/opencl/test/unit_test/os_interface/performance_counters_gen_tests.cpp index dff97a7627..afcc88a927 100644 --- a/opencl/test/unit_test/os_interface/performance_counters_gen_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index 2bcf63d531..1dfdd37eac 100644 --- a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp index 0ee7db0f79..7bf59f7a78 100644 --- a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp index 7a394f0dbe..8d2c6fb135 100644 --- a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp +++ b/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 { diff --git a/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp index 00d6aaa6d8..ff8d7ec0c4 100644 --- a/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp index 25762b6e25..444ae04d5e 100644 --- a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp +++ b/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 { diff --git a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp index 9c1912e1c9..0c771b0aa4 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp index 130e2f2918..a351d78533 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp index 9c494c5cde..1eeea5e4b0 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp index 49bc8a8b69..ce4f365dd7 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h index a80bccabfa..fe23ac6a23 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h +++ b/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" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp index 25bcf44630..830c45064e 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/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" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp index 7f1880c0b0..e1404a47dc 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp +++ b/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; diff --git a/opencl/test/unit_test/profiling/profiling_tests.cpp b/opencl/test/unit_test/profiling/profiling_tests.cpp index 00bd58a27f..485aab562e 100644 --- a/opencl/test/unit_test/profiling/profiling_tests.cpp +++ b/opencl/test/unit_test/profiling/profiling_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/source/utilities/tag_allocator.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 "opencl/source/command_queue/command_queue_hw.h" @@ -25,7 +26,6 @@ #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "opencl/test/unit_test/os_interface/mock_performance_counters.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/program/printf_handler_tests.cpp b/opencl/test/unit_test/program/printf_handler_tests.cpp index d87742802e..07b2424aea 100644 --- a/opencl/test/unit_test/program/printf_handler_tests.cpp +++ b/opencl/test/unit_test/program/printf_handler_tests.cpp @@ -9,6 +9,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -21,7 +22,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/program/process_debug_data_tests.cpp b/opencl/test/unit_test/program/process_debug_data_tests.cpp index 9dc6afa282..483d390391 100644 --- a/opencl/test/unit_test/program/process_debug_data_tests.cpp +++ b/opencl/test/unit_test/program/process_debug_data_tests.cpp @@ -1,13 +1,14 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/program/program_tests.h" -#include "test.h" #include "program_debug_data.h" diff --git a/opencl/test/unit_test/program/program_data_tests.cpp b/opencl/test/unit_test/program/program_data_tests.cpp index e9772346a6..57562d1285 100644 --- a/opencl/test/unit_test/program/program_data_tests.cpp +++ b/opencl/test/unit_test/program/program_data_tests.cpp @@ -14,6 +14,7 @@ #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/compiler_interface/linker_mock.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" @@ -23,7 +24,6 @@ #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/program/program_with_source.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/program/program_nonuniform.cpp b/opencl/test/unit_test/program/program_nonuniform.cpp index 07baa6c767..d827108e86 100644 --- a/opencl/test/unit_test/program/program_nonuniform.cpp +++ b/opencl/test/unit_test/program/program_nonuniform.cpp @@ -10,6 +10,7 @@ #include "shared/source/helpers/hash.h" #include "shared/source/helpers/ptr_math.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" @@ -21,7 +22,6 @@ #include "opencl/test/unit_test/program/program_from_binary.h" #include "opencl/test/unit_test/program/program_with_source.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index 140e5d81fc..d0d3360b55 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -29,6 +29,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_compiler_interface.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "shared/test/unit_test/device_binary_format/zebin_tests.h" #include "shared/test/unit_test/utilities/base_object_utils.h" @@ -45,7 +46,6 @@ #include "opencl/test/unit_test/program/program_from_binary.h" #include "opencl/test/unit_test/program/program_with_source.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" #include "compiler_options.h" #include "gmock/gmock.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 0ca49ce311..cdad9d888b 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 @@ -10,12 +10,12 @@ #include "shared/test/common/helpers/kernel_filename_helper.h" #include "shared/test/common/libult/global_environment.h" #include "shared/test/common/mocks/mock_source_level_debugger.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/program_fixture.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/program/program_from_binary.h" #include "opencl/test/unit_test/program/program_tests.h" -#include "test.h" #include "compiler_options.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp index 311fc827a2..f9ec025886 100644 --- a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp +++ b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/utilities/numeric.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/sampler_helpers.h" #include "opencl/source/kernel/kernel.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp index 5c7ff7179a..10ba8ff490 100644 --- a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp @@ -7,9 +7,9 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp index e9e04f15ab..cc34121dea 100644 --- a/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp +++ b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/fixtures/scenario_test_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp b/opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp index 761cbb810b..26b24e87c8 100644 --- a/opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp +++ b/opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp @@ -5,12 +5,13 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/event/async_events_handler.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/fixtures/scenario_test_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp index de692dfa62..b8624a8df0 100644 --- a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp +++ b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp @@ -11,13 +11,13 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/os_interface/windows/mock_wddm_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_hw_parse.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp index ccebd77483..5a8b917a0c 100644 --- a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp +++ b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp @@ -9,13 +9,13 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_ostime.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/scheduler/scheduler_kernel.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" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp index 1288182a8f..6e78481b18 100644 --- a/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp +++ b/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp @@ -8,13 +8,13 @@ #include "opencl/test/unit_test/scheduler/scheduler_source_tests.h" #include "shared/test/common/cmd_parse/hw_parse.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" #include "opencl/test/unit_test/fixtures/device_queue_matcher.h" #include "opencl/test/unit_test/fixtures/execution_model_fixture.h" #include "opencl/test/unit_test/mocks/mock_device_queue.h" -#include "test.h" #include "gtest/gtest.h" #include "hw_cmds.h" diff --git a/opencl/test/unit_test/scheduler/scheduler_source_tests.h b/opencl/test/unit_test/scheduler/scheduler_source_tests.h index fcd5dcb971..866655bb27 100644 --- a/opencl/test/unit_test/scheduler/scheduler_source_tests.h +++ b/opencl/test/unit_test/scheduler/scheduler_source_tests.h @@ -1,14 +1,15 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/test/common/test_macros/test.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/test_macros/test_checks_ocl.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp index 41518ed317..d9cd193d5b 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/context/context.h" #include "opencl/source/event/user_event.h" @@ -22,7 +23,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp index fff50841ea..1e5a6ece55 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp @@ -9,6 +9,7 @@ #include "shared/test/common/libult/ult_command_stream_receiver.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/source/cl_device/cl_device.h" #include "opencl/source/helpers/gmm_types_converter.h" @@ -16,7 +17,6 @@ #include "opencl/source/sharings/gl/gl_texture.h" #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp index f81839109c..50443d19cd 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp @@ -8,13 +8,13 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/sharings/gl/gl_buffer.h" #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp index 3180dbf5f7..dbbffa1fcf 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" @@ -35,7 +36,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" -#include "test.h" #include "gl_types.h" diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h b/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h index 434020dbfa..07c4240766 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h @@ -9,11 +9,11 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/sharings/unified/unified_sharing_types.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp index 8019d6de0a..d7a1492ec5 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/helpers/variable_backup.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/source/mem_obj/buffer.h" #include "opencl/source/sharings/unified/enable_unified.h" @@ -16,7 +17,6 @@ #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/unified/unified_sharing_fixtures.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp b/opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp index c0ada30370..bb3317b547 100644 --- a/opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp +++ b/opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp @@ -5,12 +5,13 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/source/sharings/va/va_surface.h" #include "opencl/test/unit_test/fixtures/kernel_arg_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/sharings/va/mock_va_sharing.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp index 86338b6b98..c0d7de2263 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp @@ -17,6 +17,7 @@ #include "shared/test/common/libult/create_command_stream.h" #include "shared/test/common/libult/linux/drm_mock.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/api/api.h" #include "opencl/source/cl_device/cl_device.h" @@ -30,7 +31,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/sharings/va/mock_va_sharing.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp index 149c8df769..98494cb266 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp @@ -13,9 +13,9 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_os_library.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" -#include "test.h" #include 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 007e5287e8..a8e768f8cc 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 @@ -11,10 +11,10 @@ #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/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp index eb9f089812..62c53bc45a 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp @@ -10,10 +10,10 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_os_library.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" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" using PreambleTest = ::testing::Test; using namespace NEO; diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp index 2740f7fb2e..f3c5451197 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp @@ -17,12 +17,12 @@ #include "shared/test/common/libult/source_level_debugger_library.h" #include "shared/test/common/mocks/mock_gmm_helper.h" #include "shared/test/common/mocks/mock_source_level_debugger.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test.h" #include #include diff --git a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl b/opencl/test/unit_test/utilities/debug_file_reader_tests.inl index ac26809071..a9b15596d5 100644 --- a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl +++ b/opencl/test/unit_test/utilities/debug_file_reader_tests.inl @@ -7,8 +7,7 @@ #include "shared/source/helpers/file_io.h" #include "shared/source/utilities/debug_file_reader.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp b/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp index 185ac2fe7b..8885e6cb7e 100644 --- a/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp +++ b/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,9 +8,9 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/file_io.h" #include "shared/source/utilities/debug_settings_reader.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/os_interface/ocl_reg_path.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/utilities/tag_allocator_tests.cpp b/opencl/test/unit_test/utilities/tag_allocator_tests.cpp index 7668dc06f8..34889d4dd0 100644 --- a/opencl/test/unit_test/utilities/tag_allocator_tests.cpp +++ b/opencl/test/unit_test/utilities/tag_allocator_tests.cpp @@ -12,9 +12,9 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/ult_device_factory.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/memory_allocator_fixture.h" -#include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/windows/get_devices_tests.cpp b/opencl/test/unit_test/windows/get_devices_tests.cpp index de13695bce..32c3ed19d4 100644 --- a/opencl/test/unit_test/windows/get_devices_tests.cpp +++ b/opencl/test/unit_test/windows/get_devices_tests.cpp @@ -13,10 +13,9 @@ #include "shared/source/os_interface/hw_info_config.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 "shared/test/common/test_macros/test_checks_shared.h" -#include "test.h" - namespace NEO { bool prepareDeviceEnvironments(ExecutionEnvironment &executionEnvironment); diff --git a/opencl/test/unit_test/windows/os_interface_tests.cpp b/opencl/test/unit_test/windows/os_interface_tests.cpp index fd4f932266..302aabf60f 100644 --- a/opencl/test/unit_test/windows/os_interface_tests.cpp +++ b/opencl/test/unit_test/windows/os_interface_tests.cpp @@ -9,8 +9,7 @@ #include "shared/source/os_interface/os_interface.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; diff --git a/opencl/test/unit_test/windows/wddm_create_tests.cpp b/opencl/test/unit_test/windows/wddm_create_tests.cpp index 4d197a20ac..88d0f6b6f9 100644 --- a/opencl/test/unit_test/windows/wddm_create_tests.cpp +++ b/opencl/test/unit_test/windows/wddm_create_tests.cpp @@ -11,8 +11,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" #include diff --git a/opencl/test/unit_test/xe_hp_core/compute_mode_tests_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/compute_mode_tests_xe_hp_core.cpp index 8801c3b113..ee8a02c00c 100644 --- a/opencl/test/unit_test/xe_hp_core/compute_mode_tests_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/compute_mode_tests_xe_hp_core.cpp @@ -6,9 +6,9 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/command_stream/compute_mode_tests.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp index b6e6454d80..70c9b37e65 100644 --- a/opencl/test/unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/copy_engine_tests_xe_hp_core.cpp @@ -15,12 +15,12 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_gmm.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp index 4cee78b168..c114c80665 100644 --- a/opencl/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_XE_HP_CORE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_XE_HP_CORE); diff --git a/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp index 997670f093..f76fc38c96 100644 --- a/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp @@ -7,10 +7,10 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp index ce453b0a18..b3ef212637 100644 --- a/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp index d4f2bdbf4e..19ad97fee0 100644 --- a/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/xehp/cache_flush_tests_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/cache_flush_tests_xehp.inl index c87b882a85..674484e216 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/cache_flush_tests_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/cache_flush_tests_xehp.inl @@ -6,11 +6,11 @@ */ #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 "opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/xehp/get_device_info_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/get_device_info_xehp.inl index 9ae99b016f..c646431efc 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/get_device_info_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/get_device_info_xehp.inl @@ -7,9 +7,9 @@ #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/test.h" #include "opencl/test/unit_test/fixtures/device_info_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl index 7df9a0093e..7d3ab2de55 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl @@ -8,9 +8,9 @@ #include "shared/source/helpers/hw_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/helpers/gtest_helpers.h" -#include "test.h" using namespace NEO; using XeHPHwInfoTest = ::testing::Test; diff --git a/opencl/test/unit_test/xe_hp_core/xehp/memory_manager_tests_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/memory_manager_tests_xehp.inl index 8f52924f6c..7c64585754 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/memory_manager_tests_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/memory_manager_tests_xehp.inl @@ -8,8 +8,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl index 5c25684bd8..9921c70c97 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl @@ -8,9 +8,9 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #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/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/xe_hp_core/xehp/source_level_debugger_csr_tests_xehp.cpp b/opencl/test/unit_test/xe_hp_core/xehp/source_level_debugger_csr_tests_xehp.cpp index 246f998264..3f9a4ab1ab 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/source_level_debugger_csr_tests_xehp.cpp +++ b/opencl/test/unit_test/xe_hp_core/xehp/source_level_debugger_csr_tests_xehp.cpp @@ -11,11 +11,11 @@ #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_command_stream_receiver_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_command_stream_receiver_xehp.inl index 661be3eea9..b527489806 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_command_stream_receiver_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_command_stream_receiver_xehp.inl @@ -8,9 +8,9 @@ #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_graphics_allocation.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" diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl index 3b5d984eb0..888495279f 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_helper.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" diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_hw_info_config_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_hw_info_config_xehp.inl index 4a476b5f18..bb313a0388 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_hw_info_config_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_hw_info_config_xehp.inl @@ -8,11 +8,11 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl index b987b4e086..e57dc34af3 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl @@ -6,12 +6,12 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_platform_caps_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_platform_caps_xehp.inl index 8c306fdad0..2667416d3a 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_platform_caps_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_platform_caps_xehp.inl @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_preamble_xehp.cpp b/opencl/test/unit_test/xe_hp_core/xehp/test_preamble_xehp.cpp index 08e2f2a657..8f73959766 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_preamble_xehp.cpp +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_preamble_xehp.cpp @@ -8,10 +8,10 @@ #include "shared/source/command_stream/stream_properties.h" #include "shared/source/debug_settings/debug_settings_manager.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" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl index 8ca3f9eea7..cfa27150c9 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl @@ -8,10 +8,10 @@ #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_memory_manager.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp index 04bb72ee25..b68fac1cd0 100644 --- a/opencl/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp @@ -11,8 +11,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_aub_center.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; using XeHpcCoreAubCenterTests = ::testing::Test; diff --git a/opencl/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp index d15e5a23ab..a783633666 100644 --- a/opencl/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp @@ -10,10 +10,10 @@ #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" -#include "test.h" using namespace NEO; using AubCommandStreamReceiverXeHpcCoreTests = ::testing::Test; diff --git a/opencl/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp index ac6045a71d..261fbea0b9 100644 --- a/opencl/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp @@ -7,9 +7,9 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp index 72d5d01189..76295c3738 100644 --- a/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp @@ -8,6 +8,7 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp index 4d619d7025..5afb413337 100644 --- a/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/copy_engine_tests_xe_hpc_core.cpp @@ -14,13 +14,13 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp index d59d7a84b5..ba8db82851 100644 --- a/opencl/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/dispatch_walker_tests_xe_hpc_core.cpp @@ -10,9 +10,9 @@ #include "shared/source/os_interface/device_factory.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/mocks/mock_platform.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp index d710b9597f..047bf128f3 100644 --- a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp @@ -11,13 +11,13 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp index f9c00fead3..d77afea9d3 100644 --- a/opencl/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_XE_HPC_CORE); diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp index 11daa3ed32..3e788c3278 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/command_stream_receiver_hw_tests_pvc.cpp @@ -16,6 +16,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/ult_aub_command_stream_receiver.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" @@ -29,7 +30,6 @@ #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp index 5d40ce9ca5..07409c9067 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/engine_node_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; using EngineNodeHelperPvcTests = ::Test; diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/get_device_info_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/get_device_info_pvc.cpp index 750148569b..e3535ebff4 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/get_device_info_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/get_device_info_pvc.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/device_info_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp index 50a6f5fa08..9c18e0d0a5 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp @@ -8,9 +8,9 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #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/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp index feb12dbc31..d63084ab39 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_helper.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" diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp index bb7f454a93..428bbc9521 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp @@ -10,8 +10,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp index c399202824..3692ed0cc8 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp @@ -9,11 +9,11 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/state_base_address.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.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; using CmdsProgrammingTestsXeHpcCore = UltCommandStreamReceiverTest; diff --git a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp index c4859adefe..95023b402c 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp @@ -6,12 +6,12 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/device_info_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp index 49f0dd4323..b7eaaef50b 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp index bb3756c5b5..90f7b022e6 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp index 9026441abe..a5e5f9e076 100644 --- a/opencl/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/aub_center_using_aubstream_lib_tests_xe_hpg_core.cpp @@ -11,8 +11,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_aub_center.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; typedef ::testing::Test xe_hpg_coreAubCenterTests; diff --git a/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp index dc0ef3de11..c83be6b4be 100644 --- a/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp @@ -6,9 +6,9 @@ */ #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp index 6dc6432eda..9e9709b505 100644 --- a/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/copy_engine_tests_xe_hpg_core.cpp @@ -15,12 +15,12 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/excludes_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/excludes_dg2.cpp index f4ab1246e3..504ab0c558 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/excludes_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/excludes_dg2.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(HwHelperTest, GivenZeroSlmSizeWhenComputeSlmSizeIsCalledThenCorrectValueIsReturned, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowCompressionIsCalledThenTrueIsReturned, IGFX_DG2); diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/get_device_info_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/get_device_info_dg2.cpp index 500403041b..e189bb1490 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/get_device_info_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/get_device_info_dg2.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/device_info_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/hw_info_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/hw_info_tests_dg2.cpp index 996973b161..39262bc86e 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/hw_info_tests_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/hw_info_tests_dg2.cpp @@ -8,9 +8,9 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/helpers/gtest_helpers.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp index c1c840b6bf..7ba869124c 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/memory_manager_tests_dg2.cpp @@ -8,8 +8,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp index 66d7828486..9bbd5c43de 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp @@ -8,12 +8,12 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #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/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/sampler/sampler.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "test.h" #include diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp index d9f5bad9a9..4a68b16c13 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp @@ -10,11 +10,11 @@ #include "shared/source/helpers/state_base_address.h" #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/test.h" #include "opencl/source/mem_obj/buffer.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; using CmdsProgrammingTestsDg2 = UltCommandStreamReceiverTest; diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp index 2610d5fa41..4831dca6e0 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp @@ -8,9 +8,9 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/hw_helper_tests.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" diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp index f11f5e7782..13d80ba868 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp @@ -9,8 +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/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2_windows.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2_windows.cpp index 001900ba1f..465b6ed417 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2_windows.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2_windows.cpp @@ -7,8 +7,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/helpers/default_hw_info.h" - -#include "test.h" +#include "shared/test/common/test_macros/test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp index 30c98bd329..7495be62fa 100644 --- a/opencl/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp @@ -5,7 +5,7 @@ * */ -#include "test.h" +#include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_XE_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_XE_HPG_CORE); diff --git a/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp index 10d9458cd8..5c923bcb12 100644 --- a/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp @@ -9,6 +9,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/state_base_address.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" @@ -16,7 +17,6 @@ #include "opencl/source/mem_obj/image.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; using CmdsProgrammingTestsXeHpgCore = UltCommandStreamReceiverTest; diff --git a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp index f0784ad3bb..4dfb296e9c 100644 --- a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/test_local_work_size_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_local_work_size_xe_hpg_core.cpp index 4a61539897..bb0f150b89 100644 --- a/opencl/test/unit_test/xe_hpg_core/test_local_work_size_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/test_local_work_size_xe_hpg_core.cpp @@ -8,12 +8,12 @@ #include "shared/source/helpers/hw_helper.h" #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/test.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp index 03a7f68d6d..e1bef66825 100644 --- a/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/common/test_macros/test.h" + #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "test.h" using namespace NEO;