summaryrefslogtreecommitdiffstats
path: root/config/cmake/scripts/CTestScript.cmake
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2018-11-20 17:03:58 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2018-11-20 17:03:58 (GMT)
commit720bbdfe614660c885cd2dd31e5e4678422fcbcf (patch)
tree0cd8db0f0ed5aecbc6e0b1838cfec3224d4580c3 /config/cmake/scripts/CTestScript.cmake
parent9620069142f201c9c206d57086783d65bd2c698a (diff)
downloadhdf5-720bbdfe614660c885cd2dd31e5e4678422fcbcf.zip
hdf5-720bbdfe614660c885cd2dd31e5e4678422fcbcf.tar.gz
hdf5-720bbdfe614660c885cd2dd31e5e4678422fcbcf.tar.bz2
Changes to CMake code to pause cmake/ctest, waiting for batch jobs to
run and finish.
Diffstat (limited to 'config/cmake/scripts/CTestScript.cmake')
-rwxr-xr-xconfig/cmake/scripts/CTestScript.cmake19
1 files changed, 8 insertions, 11 deletions
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 41366bd..09ff63b 100755
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -265,9 +265,6 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
if (NOT LOCAL_MEMCHECK_TEST)
if (NOT LOCAL_BATCH_TEST)
ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
- if (LOCAL_SUBMIT)
- ctest_submit (PARTS Test)
- endif ()
else ()
file(STRINGS ${CTEST_BINARY_DIRECTORY}/Testing/TAG TAG_CONTENTS REGEX "^2([0-9]+)[-]([0-9]+)$")
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_SOURCE_DIRECTORY}/bin/batch/${LOCAL_BATCH_SCRIPT_NAME})
@@ -277,11 +274,11 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
ctest_sleep(60)
execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
endwhile(result)
- if (LOCAL_SUBMIT)
- ctest_submit (PARTS Test)
- endif ()
if (LOCAL_BATCH_SCRIPT_PARALLEL_NAME)
- message(STATUS "Found ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml. Renaming to SerialTest.xml")
+ if (LOCAL_SUBMIT)
+ ctest_submit (PARTS Test)
+ endif ()
+ message(STATUS "Found ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml for serial tests. Renaming to SerialTest.xml")
file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/SerialTest.xml)
unset(result CACHE)
execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_SOURCE_DIRECTORY}/bin/batch/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
@@ -291,12 +288,12 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
ctest_sleep(60)
execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
endwhile(result)
- if (LOCAL_SUBMIT)
- ctest_submit (PARTS Test)
- endif ()
- message(STATUS "Found ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml. Done with parallel batch tests.")
+ message(STATUS "Found ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml for parallel tests.")
endif()
endif ()
+ if (LOCAL_SUBMIT)
+ ctest_submit (PARTS Test)
+ endif ()
if (${res} LESS 0 OR ${res} GREATER 0)
file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Tests: ${res}\n")
endif ()