From acb8109c1045397957aa84dac238e0ee54de3d10 Mon Sep 17 00:00:00 2001
From: Kamil Kopryk <kamil.kopryk@intel.com>
Date: Mon, 13 Oct 2025 21:45:25 +0000
Subject: [PATCH] fix: add shared mt ults runner

Related-To: NEO-14577

Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
---
 cmake/run_ult_target.cmake                    | 31 +++++++++++++++++++
 shared/test/unit_test/mt_tests/CMakeLists.txt |  5 ---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/cmake/run_ult_target.cmake b/cmake/run_ult_target.cmake
index c7f2c49ce9..7c1274dff3 100644
--- a/cmake/run_ult_target.cmake
+++ b/cmake/run_ult_target.cmake
@@ -54,6 +54,37 @@ if(NOT NEO_SKIP_SHARED_UNIT_TESTS)
     )
 
     add_dependencies(run_shared_tests run_${product}_${revision_id}_shared_tests)
+
+    if(NOT NEO_SKIP_MT_UNIT_TESTS)
+
+      unset(GTEST_OUTPUT)
+      if(DEFINED GTEST_OUTPUT_DIR)
+        set(GTEST_OUTPUT "--gtest_output=json:${GTEST_OUTPUT_DIR}/shared-${product}-${revision_id}-mt_tests-results.json")
+      endif()
+
+      if(NOT TARGET run_shared_mt_tests)
+        add_custom_target(run_shared_mt_tests)
+      endif()
+      set_target_properties(run_shared_mt_tests PROPERTIES FOLDER ${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER})
+      add_dependencies(run_mt_unit_tests run_shared_mt_tests)
+
+      add_custom_target(run_${product}_${revision_id}_shared_mt_tests)
+      set_target_properties(run_${product}_${revision_id}_shared_mt_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
+
+      add_custom_command(
+                         TARGET run_${product}_${revision_id}_shared_mt_tests
+                         POST_BUILD
+                         COMMAND WORKING_DIRECTORY ${TargetDir}
+                         COMMAND echo create working directory ${TargetDir}/shared/${product}/${revision_id}
+                         COMMAND ${CMAKE_COMMAND} -E make_directory ${TargetDir}/shared/${product}/${revision_id}
+                         COMMAND echo Running neo_shared_mt_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}
+                         COMMAND echo Cmd line: ${NEO_RUN_INTERCEPTOR_LIST} $<TARGET_FILE:neo_shared_mt_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${GTEST_OUTPUT} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id} --dev_id ${device_id}
+                         COMMAND ${NEO_RUN_INTERCEPTOR_LIST} $<TARGET_FILE:neo_shared_mt_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${GTEST_OUTPUT} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id} --dev_id ${device_id}
+      )
+
+      add_dependencies(run_shared_mt_tests run_${product}_${revision_id}_shared_mt_tests)
+    endif()
+
   endif()
 endif()
 
diff --git a/shared/test/unit_test/mt_tests/CMakeLists.txt b/shared/test/unit_test/mt_tests/CMakeLists.txt
index 1dbb729060..a10c8c65a1 100644
--- a/shared/test/unit_test/mt_tests/CMakeLists.txt
+++ b/shared/test/unit_test/mt_tests/CMakeLists.txt
@@ -11,7 +11,6 @@ if(NOT NEO_SKIP_MT_UNIT_TESTS)
   include(${NEO_SOURCE_DIR}/cmake/setup_ult_global_flags.cmake)
 
   set(SHARED_MT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-  add_custom_target(run_shared_mt_unit_tests)
 
   add_executable(neo_shared_mt_tests EXCLUDE_FROM_ALL
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
@@ -72,9 +71,5 @@ if(NOT NEO_SKIP_MT_UNIT_TESTS)
     set_property(TARGET neo_shared_mt_tests APPEND_STRING PROPERTY COMPILE_FLAGS " -g")
   endif()
 
-  set_target_properties(run_shared_mt_unit_tests PROPERTIES
-                        FOLDER ${SHARED_TEST_PROJECTS_FOLDER}
-  )
-
   create_project_source_tree(neo_shared_mt_tests)
 endif()