HDFFV-10594, HDFFV-10332, HDFFV-9059 merge from develop

This commit is contained in:
Allen Byrne
2018-10-29 12:15:13 -05:00
parent 8c26358eca
commit 0ce736c15a
21 changed files with 1388 additions and 1218 deletions

View File

@@ -263,7 +263,11 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
if (NOT LOCAL_SKIP_TEST)
if (NOT LOCAL_MEMCHECK_TEST)
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
if (NOT LOCAL_BATCH_TEST)
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
else ()
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${LOCAL_BATCH_SCRIPT_NAME})
endif ()
if (LOCAL_SUBMIT)
ctest_submit (PARTS Test)
endif ()