From 512dac67facbc1fe15e4ca7c82ad57e2aae1f318 Mon Sep 17 00:00:00 2001
From: Mateusz Jablonski <mateusz.jablonski@intel.com>
Date: Fri, 30 Aug 2024 09:36:03 +0000
Subject: [PATCH] test: move xe specific mocks to shared/test/common

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
---
 .../common/os_interface/linux/CMakeLists.txt  |  2 +-
 .../os_interface/linux/xe/CMakeLists.txt      | 21 +++++++++++++++++++
 .../os_interface/linux/xe/mock_drm_xe.cpp     | 10 +++++++++
 .../os_interface/linux/xe/mock_drm_xe.h       |  2 +-
 .../os_interface/linux/xe/mock_drm_xe.inl     |  0
 .../linux/xe/mock_drm_xe_definitions.inl      |  2 +-
 .../linux/xe/mock_ioctl_helper_xe.h           |  0
 .../os_interface/linux/xe/CMakeLists.txt      |  4 ----
 .../linux/xe/ioctl_helper_xe_perf_tests.cpp   |  2 +-
 .../linux/xe/ioctl_helper_xe_tests.cpp        |  4 ++--
 .../os_interface/linux/xe/mock_drm_xe.cpp     | 10 ---------
 11 files changed, 37 insertions(+), 20 deletions(-)
 create mode 100644 shared/test/common/os_interface/linux/xe/CMakeLists.txt
 create mode 100644 shared/test/common/os_interface/linux/xe/mock_drm_xe.cpp
 rename shared/test/{unit_test => common}/os_interface/linux/xe/mock_drm_xe.h (80%)
 rename shared/test/{unit_test => common}/os_interface/linux/xe/mock_drm_xe.inl (100%)
 rename shared/test/{unit_test => common}/os_interface/linux/xe/mock_drm_xe_definitions.inl (99%)
 rename shared/test/{unit_test => common}/os_interface/linux/xe/mock_ioctl_helper_xe.h (100%)
 delete mode 100644 shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.cpp

diff --git a/shared/test/common/os_interface/linux/CMakeLists.txt b/shared/test/common/os_interface/linux/CMakeLists.txt
index 1f5d1b92ac..18c8dc3b84 100644
--- a/shared/test/common/os_interface/linux/CMakeLists.txt
+++ b/shared/test/common/os_interface/linux/CMakeLists.txt
@@ -23,6 +23,6 @@ if(UNIX)
                    ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_prelim_fixtures.h
     )
   endif()
-  add_subdirectories()
 endif()
+add_subdirectories()
 
diff --git a/shared/test/common/os_interface/linux/xe/CMakeLists.txt b/shared/test/common/os_interface/linux/xe/CMakeLists.txt
new file mode 100644
index 0000000000..b91e8251d1
--- /dev/null
+++ b/shared/test/common/os_interface/linux/xe/CMakeLists.txt
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(neo_libult_common_SRCS_LIB_ULT_LINUX_XE
+    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm_xe.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm_xe.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm_xe.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm_xe_definitions.inl
+)
+if(UNIX)
+
+  target_sources(neo_libult_common PRIVATE ${neo_libult_common_SRCS_LIB_ULT_LINUX_XE})
+endif()
+add_subdirectories()
+
+set_property(GLOBAL APPEND PROPERTY neo_libult_common_SRCS_LIB_ULT_LINUX_XE ${neo_libult_common_SRCS_LIB_ULT_LINUX_XE})
+
diff --git a/shared/test/common/os_interface/linux/xe/mock_drm_xe.cpp b/shared/test/common/os_interface/linux/xe/mock_drm_xe.cpp
new file mode 100644
index 0000000000..b7a4150938
--- /dev/null
+++ b/shared/test/common/os_interface/linux/xe/mock_drm_xe.cpp
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2024 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/test/common/os_interface/linux/xe/mock_drm_xe.h"
+
+#include "shared/test/common/os_interface/linux/xe/mock_drm_xe_definitions.inl"
diff --git a/shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.h b/shared/test/common/os_interface/linux/xe/mock_drm_xe.h
similarity index 80%
rename from shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.h
rename to shared/test/common/os_interface/linux/xe/mock_drm_xe.h
index eee2b1d00e..1ca8e75ed5 100644
--- a/shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.h
+++ b/shared/test/common/os_interface/linux/xe/mock_drm_xe.h
@@ -10,7 +10,7 @@
 #include "shared/test/common/libult/linux/drm_mock.h"
 namespace NEO {
 namespace XeDrm {
-#include "shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.inl"
+#include "shared/test/common/os_interface/linux/xe/mock_drm_xe.inl"
 }
 } // namespace NEO
 using NEO::XeDrm::DrmMockXe;
diff --git a/shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.inl b/shared/test/common/os_interface/linux/xe/mock_drm_xe.inl
similarity index 100%
rename from shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.inl
rename to shared/test/common/os_interface/linux/xe/mock_drm_xe.inl
diff --git a/shared/test/unit_test/os_interface/linux/xe/mock_drm_xe_definitions.inl b/shared/test/common/os_interface/linux/xe/mock_drm_xe_definitions.inl
similarity index 99%
rename from shared/test/unit_test/os_interface/linux/xe/mock_drm_xe_definitions.inl
rename to shared/test/common/os_interface/linux/xe/mock_drm_xe_definitions.inl
index 02bacbf64d..cf34f9e5bd 100644
--- a/shared/test/unit_test/os_interface/linux/xe/mock_drm_xe_definitions.inl
+++ b/shared/test/common/os_interface/linux/xe/mock_drm_xe_definitions.inl
@@ -6,8 +6,8 @@
  */
 
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/test/common/os_interface/linux/xe/mock_ioctl_helper_xe.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/os_interface/linux/xe/mock_ioctl_helper_xe.h"
 
 std::unique_ptr<DrmMockXe> DrmMockXe::create(RootDeviceEnvironment &rootDeviceEnvironment) {
     auto drm = std::unique_ptr<DrmMockXe>(new DrmMockXe{rootDeviceEnvironment});
diff --git a/shared/test/unit_test/os_interface/linux/xe/mock_ioctl_helper_xe.h b/shared/test/common/os_interface/linux/xe/mock_ioctl_helper_xe.h
similarity index 100%
rename from shared/test/unit_test/os_interface/linux/xe/mock_ioctl_helper_xe.h
rename to shared/test/common/os_interface/linux/xe/mock_ioctl_helper_xe.h
diff --git a/shared/test/unit_test/os_interface/linux/xe/CMakeLists.txt b/shared/test/unit_test/os_interface/linux/xe/CMakeLists.txt
index 1759cd78b7..6ddfa510cf 100644
--- a/shared/test/unit_test/os_interface/linux/xe/CMakeLists.txt
+++ b/shared/test/unit_test/os_interface/linux/xe/CMakeLists.txt
@@ -6,10 +6,6 @@
 
 set(NEO_CORE_OS_INTERFACE_TESTS_LINUX_XE
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm_xe.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm_xe.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm_xe.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_drm_xe_definitions.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/ioctl_helper_xe_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/ioctl_helper_xe_perf_tests.cpp
 )
diff --git a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_perf_tests.cpp b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_perf_tests.cpp
index c11f271491..6129b68a3c 100644
--- a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_perf_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_perf_tests.cpp
@@ -10,8 +10,8 @@
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h"
 #include "shared/test/common/mocks/linux/mock_os_context_linux.h"
+#include "shared/test/common/os_interface/linux/xe/mock_drm_xe.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.h"
 
 using namespace NEO;
 
diff --git a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
index 1db7880cca..a9175d5b54 100644
--- a/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
@@ -14,9 +14,9 @@
 #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h"
 #include "shared/test/common/mocks/linux/mock_os_context_linux.h"
 #include "shared/test/common/mocks/linux/mock_os_time_linux.h"
+#include "shared/test/common/os_interface/linux/xe/mock_drm_xe.h"
+#include "shared/test/common/os_interface/linux/xe/mock_ioctl_helper_xe.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.h"
-#include "shared/test/unit_test/os_interface/linux/xe/mock_ioctl_helper_xe.h"
 using namespace NEO;
 
 TEST(IoctlHelperXeTest, givenXeDrmVersionsWhenGettingIoctlHelperThenValidIoctlHelperIsReturned) {
diff --git a/shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.cpp b/shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.cpp
deleted file mode 100644
index 4ea0530e65..0000000000
--- a/shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (C) 2024 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "shared/test/unit_test/os_interface/linux/xe/mock_drm_xe.h"
-
-#include "shared/test/unit_test/os_interface/linux/xe/mock_drm_xe_definitions.inl"