Move some l0, opencl tests to shared

ddabek-i · Compute-Runtime-Automation · commit d8a7a600818c · 2021-05-14T15:39:25.000+02:00
Related-To: NEO-5807

Signed-off-by: Dominik Dabek &lt;dominik.dabek@intel.com&gt;
diff --git a/opencl/test/unit_test/gen12lp/adls/CMakeLists.txt b/opencl/test/unit_test/gen12lp/adls/CMakeLists.txt
@@ -1,13 +1,12 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_ADLS)
   set(IGDRCL_SRCS_tests_gen12lp_adls
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_adls.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_adls.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/excludes_adls.cpp
   )
diff --git a/opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt b/opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,7 +8,6 @@ if(TESTS_RKL)
   set(IGDRCL_SRCS_tests_gen12lp_rkl
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_helper_rkl.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_rkl.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/excludes_rkl.cpp
   )
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_rkl})
diff --git a/shared/test/common/gen12lp/adls/CMakeLists.txt b/shared/test/common/gen12lp/adls/CMakeLists.txt
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(TESTS_ADLS)
+  set(NEO_CORE_TESTS_GEN12LP_ADLS
+      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_adls.cpp
+  )
+
+  target_sources(${TARGET_NAME} PRIVATE ${NEO_CORE_TESTS_GEN12LP_ADLS})
+  add_subdirectories()
+endif()
diff --git a/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp b/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp
diff --git a/shared/test/common/gen12lp/rkl/CMakeLists.txt b/shared/test/common/gen12lp/rkl/CMakeLists.txt
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(TESTS_RKL)
+  set(IGDRCL_SRCS_tests_gen12lp_rkl
+      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_rkl.cpp
+  )
+  target_sources(neo_shared_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_rkl})
+  add_subdirectories()
+endif()
diff --git a/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp b/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,12 @@`
`1`	`1`	`#`
`2`		`-# Copyright (C) 2020 Intel Corporation`
	`2`	`+# Copyright (C) 2020-2021 Intel Corporation`
`3`	`3`	`#`
`4`	`4`	`# SPDX-License-Identifier: MIT`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`if(TESTS_ADLS)`
`8`	`8`	`set(IGDRCL_SRCS_tests_gen12lp_adls`
`9`	`9`	`${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt`
`10`		`- ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_adls.cpp`
`11`	`10`	`${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_adls.cpp`
`12`	`11`	`${CMAKE_CURRENT_SOURCE_DIR}/excludes_adls.cpp`
`13`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright (C) 2018-2020 Intel Corporation`
	`2`	`+# Copyright (C) 2018-2021 Intel Corporation`
`3`	`3`	`#`
`4`	`4`	`# SPDX-License-Identifier: MIT`
`5`	`5`	`#`
`@@ -8,7 +8,6 @@ if(TESTS_RKL)`
`8`	`8`	`set(IGDRCL_SRCS_tests_gen12lp_rkl`
`9`	`9`	`${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt`
`10`	`10`	`${CMAKE_CURRENT_SOURCE_DIR}/test_hw_helper_rkl.cpp`
`11`		`- ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_rkl.cpp`
`12`	`11`	`${CMAKE_CURRENT_SOURCE_DIR}/excludes_rkl.cpp`
`13`	`12`	`)`
`14`	`13`	`target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_rkl})`