From d8a7a600818c35b6d1c5e0a41ec24f3d2666ebc4 Mon Sep 17 00:00:00 2001
From: Dominik Dabek <dominik.dabek@intel.com>
Date: Mon, 10 May 2021 15:57:05 +0000
Subject: [PATCH] Move some l0, opencl tests to shared

Related-To: NEO-5807

Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
---
 opencl/test/unit_test/gen12lp/adls/CMakeLists.txt |  3 +--
 opencl/test/unit_test/gen12lp/rkl/CMakeLists.txt  |  3 +--
 shared/test/common/gen12lp/adls/CMakeLists.txt    | 15 +++++++++++++++
 .../gen12lp/adls/test_hw_info_config_adls.cpp     |  0
 shared/test/common/gen12lp/rkl/CMakeLists.txt     | 14 ++++++++++++++
 .../gen12lp/rkl/test_hw_info_config_rkl.cpp       |  0
 6 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 shared/test/common/gen12lp/adls/CMakeLists.txt
 rename {opencl/test/unit_test => shared/test/common}/gen12lp/adls/test_hw_info_config_adls.cpp (100%)
 create mode 100644 shared/test/common/gen12lp/rkl/CMakeLists.txt
 rename {opencl/test/unit_test => shared/test/common}/gen12lp/rkl/test_hw_info_config_rkl.cpp (100%)

diff --git a/opencl/test/unit_test/gen12lp/adls/CMakeLists.txt b/opencl/test/unit_test/gen12lp/adls/CMakeLists.txt
index 8f89d28b65..4593326c24 100644
--- a/opencl/test/unit_test/gen12lp/adls/CMakeLists.txt
+++ b/opencl/test/unit_test/gen12lp/adls/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -7,7 +7,6 @@
 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
index 53c68836e0..005675ba35 100644
--- 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
new file mode 100644
index 0000000000..d1ae82a8aa
--- /dev/null
+++ 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/opencl/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp b/shared/test/common/gen12lp/adls/test_hw_info_config_adls.cpp
similarity index 100%
rename from opencl/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp
rename to 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
new file mode 100644
index 0000000000..2e44e04dcd
--- /dev/null
+++ 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/opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp b/shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp
similarity index 100%
rename from opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp
rename to shared/test/common/gen12lp/rkl/test_hw_info_config_rkl.cpp