Follow better CMake/VTK-m practices

This commit is contained in:
Mark Bolstad 2023-01-09 15:05:19 -07:00
parent c5ce6cb96b
commit 841da4169e

@ -290,9 +290,9 @@ vtkm_unit_tests but not in its test dependencies. Add test dependencies to \
list(GET per_device_serial ${index} run_serial)
# If set, remove the VTK-m specified timeouts for CTest
set(EXTRA_ARGS)
set(extra_args)
if (NOT VTKm_OVERRIDE_CTEST_TIMEOUT)
list(APPEND EXTRA_ARGS TIMEOUT ${timeout})
list(APPEND extra_args TIMEOUT ${timeout})
endif()
foreach (test ${VTKm_UT_SOURCES} ${VTKm_UT_DEVICE_SOURCES})
@ -306,7 +306,7 @@ vtkm_unit_tests but not in its test dependencies. Add test dependencies to \
)
set_tests_properties("${tname}${upper_backend}_mpi" PROPERTIES
LABELS "${upper_backend};${VTKm_UT_LABEL}"
${EXTRA_ARGS}
${extra_args}
RUN_SERIAL ${run_serial}
FAIL_REGULAR_EXPRESSION "runtime error")
endif() # VTKm_ENABLE_MPI
@ -317,7 +317,7 @@ vtkm_unit_tests but not in its test dependencies. Add test dependencies to \
)
set_tests_properties("${tname}${upper_backend}_nompi" PROPERTIES
LABELS "${upper_backend};${VTKm_UT_LABEL}"
${EXTRA_ARGS}
${extra_args}
RUN_SERIAL ${run_serial}
FAIL_REGULAR_EXPRESSION "runtime error")
@ -329,11 +329,12 @@ vtkm_unit_tests but not in its test dependencies. Add test dependencies to \
)
set_tests_properties("${tname}${upper_backend}" PROPERTIES
LABELS "${upper_backend};${VTKm_UT_LABEL}"
${EXTRA_ARGS}
${extra_args}
RUN_SERIAL ${run_serial}
FAIL_REGULAR_EXPRESSION "runtime error")
endif() # VTKm_UT_MPI
endforeach()
unset(extra_args)
endforeach()
endfunction(vtkm_unit_tests)