Remove duplicated test.h header

use full path to include test.h
add missing headers to source list


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

level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_2.cpp

@@ -6,8 +6,7 @@
  */
 
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/core/source/image/image_hw.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"

level_zero/tools/test/unit_tests/sources/sysman/linux/test_fw_util.cpp

@@ -6,8 +6,7 @@
  */
 
 #include "shared/test/common/helpers/variable_backup.h"
-
-#include "test.h"
+#include "shared/test/common/test_macros/test.h"
 
 #include "level_zero/tools/source/sysman/linux/firmware_util/firmware_util_imp.h"
 #include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h"

opencl/test/unit_test/gen_common/CMakeLists.txt

@@ -9,7 +9,6 @@ set(IGDRCL_SRCS_tests_gen_common
     ${CMAKE_CURRENT_SOURCE_DIR}/exclude_tests/exclude_test_declare.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/exclude_tests/exclude_test_exclude.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/gen_commands_common_validation.h
-    ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}test.h
 )
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen_common})
 

shared/test/common/test_macros/CMakeLists.txt

@@ -6,10 +6,10 @@
 
 set(NEO_CORE_test_macros
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/header${BRANCH_DIR_SUFFIX}test.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/test.h
     ${CMAKE_CURRENT_SOURCE_DIR}/matchers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/test_checks_shared.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_checks_shared.h
 )
-
+add_subdirectories()
 set_property(GLOBAL PROPERTY NEO_CORE_test_macros ${NEO_CORE_test_macros})

shared/test/common/test_macros/header/CMakeLists.txt

@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+add_subdirectories()
+set(NEO_CORE_test_macros
+    ${NEO_CORE_test_macros}
+    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/common_matchers.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/per_product_test_definitions.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/per_product_test_selector.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/per_product_test_selector_definitions.h
+    PARENT_SCOPE
+)

shared/test/common/test_macros/header/test.h

@@ -1,9 +0,0 @@
-/*
- * Copyright (C) 2018-2021 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#pragma once
-#include "shared/test/common/test_macros/test.h"

shared/test/unit_test/gen11/hw_cmds_gen11_tests.cpp

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

shared/test/unit_test/gen12lp/hw_cmds_gen12lp_tests.cpp

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

shared/test/unit_test/gen9/hw_cmds_gen9_tests.cpp

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

shared/test/unit_test/xe_hp_core/hw_cmds_xe_hp_core_tests.cpp

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

shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp

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

shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp

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