diff --git a/scripts/cmake/Functions.cmake b/scripts/cmake/Functions.cmake index 765d12fa53869246554e0c8f298e20d383864f16..6393507f15821cf51e2a274a41be205311c8471b 100644 --- a/scripts/cmake/Functions.cmake +++ b/scripts/cmake/Functions.cmake @@ -103,3 +103,9 @@ function(ogs_add_library targetName) UNITY_BUILD ${OGS_USE_UNITY_BUILDS}) endif() endfunction() + +function(current_dir_as_list baseDir outList) + file(RELATIVE_PATH REL_DIR ${PROJECT_SOURCE_DIR}/${baseDir} ${CMAKE_CURRENT_LIST_DIR}) + string(REPLACE "/" ";" DIR_LIST ${REL_DIR}) + set(${outList} ${DIR_LIST} PARENT_SCOPE) +endfunction() diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake index 1704da6ebac527ebec3863802971e9bf643a270a..e47de17eca97b8f3ac63138abf2d159cb15d6381 100644 --- a/scripts/cmake/test/AddTest.cmake +++ b/scripts/cmake/test/AddTest.cmake @@ -259,7 +259,6 @@ Use six arguments version of AddTest with absolute and relative tolerances") -DPython3_EXECUTABLE=${Python3_EXECUTABLE} -P ${PROJECT_SOURCE_DIR}/scripts/cmake/test/AddTestWrapper.cmake ) - set_tests_properties(${TEST_NAME} PROPERTIES COST ${AddTest_RUNTIME}) if(DEFINED AddTest_DEPENDS) set_tests_properties(${TEST_NAME} PROPERTIES DEPENDS ${AddTest_DEPENDS}) endif() @@ -273,7 +272,13 @@ Use six arguments version of AddTest with absolute and relative tolerances") if(DEFINED MPI_PROCESSORS) set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${MPI_PROCESSORS}) endif() - set_tests_properties(${TEST_NAME} PROPERTIES DISABLED ${AddTest_DISABLED}) + + current_dir_as_list(ProcessLib DIR_LABELS) + set_tests_properties(${TEST_NAME} PROPERTIES + COST ${AddTest_RUNTIME} + DISABLED ${AddTest_DISABLED} + LABELS "${DIR_LABELS}" + ) if(TARGET ${AddTest_EXECUTABLE}) add_dependencies(ctest ${AddTest_EXECUTABLE}) diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake index 43f488c1010ac972242ac894ecb79f095ca3d3f5..5f332a96757a3b0a73a68548a884688783036340 100644 --- a/scripts/cmake/test/OgsTest.cmake +++ b/scripts/cmake/test/OgsTest.cmake @@ -51,10 +51,12 @@ function (OgsTest) # WORKING_DIRECTORY ${OgsTest_BINARY_DIR} # COMMAND ${OgsTest_WRAPPER} $<TARGET_FILE:ogs> -r ${OgsTest_SOURCE_DIR} ${OgsTest_SOURCE_DIR}/${OgsTest_NAME}) + current_dir_as_list(ProcessLib DIR_LABELS) set_tests_properties(${TEST_NAME} PROPERTIES ENVIRONMENT VTKDIFF_EXE=$<TARGET_FILE:vtkdiff> COST ${OgsTest_RUNTIME} DISABLED ${OgsTest_DISABLED} + LABELS "${DIR_LABELS}" ) if(TARGET ${OgsTest_EXECUTABLE})