WIP 2024-04-24 śro 13:37

Author: lslusarczyk

.github/workflows/pr.yml

@@ -101,9 +101,9 @@ jobs:
             build/CMakeCache.txt
             build/envdump.txt
             build/Testing
-            build/test/gtest/mhp/*.log
-            build/benchmarks/gbench/mhp/*.log
-            build/examples/mhp/*.log
+            build/test/gtest/{m,s}hp/*.log
+            build/benchmarks/gbench/{m,s}hp/*.log
+            build/examples/{m,s}hp/*.log
 
   ishmem_unit_tests:
     runs-on: pvc

CMakeLists.txt

@@ -147,7 +147,7 @@ add_custom_target(all-tests DEPENDS mhp-all-tests shp-all-tests)
 
 function(add_mhp_ctest_impl)
   set(options OFFLOAD GDB SYCL DRLOGS TESTLABEL)
-  set(oneValueArgs NAME TEST_NAME NPROC)
+  set(oneValueArgs NAME TEST_NAME NPROC TIMEOUT)
   set(multiValueArgs TARGS) # Test ARGumentS
 
   cmake_parse_arguments(AMC "${options}" "${oneValueArgs}" "${multiValueArgs}"
@@ -220,7 +220,12 @@ function(add_mhp_ctest_impl)
       ${MPIEXEC_PREFLAGS} ${extra_mpiflags} ${wrapper_script} ./${AMC_NAME}
       ${drlogs_param} ${sycl_param} ${AMC_TARGS} COMMAND_EXPAND_LISTS)
 
-  set_tests_properties(${AMC_TEST_NAME} PROPERTIES TIMEOUT 60)
+  if(DEFINED AMC_TIMEOUT)
+    set_tests_properties(${AMC_TEST_NAME} PROPERTIES TIMEOUT ${AMC_TIMEOUT})
+  else()
+    set_tests_properties(${AMC_TEST_NAME} PROPERTIES TIMEOUT 60)
+  endif()
+
   if(AMC_TESTLABEL)
     set_property(TEST ${AMC_TEST_NAME} PROPERTY LABELS TESTLABEL MHP)
   endif()

test/gtest/mhp/CMakeLists.txt

@@ -118,7 +118,7 @@ if(ENABLE_SYCL)
 
   foreach(nproc RANGE 2 4)
     add_mhp_ctest(
-      NAME mhp-tests NPROC ${nproc} SYCL TARGS
+      NAME mhp-tests NPROC ${nproc} TIMEOUT 150 SYCL TARGS
       --gtest_filter=-${sycl-exclusions})
   endforeach()
   add_mhp_ctest(