diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2011-07-11 15:17:42 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2011-07-11 15:17:42 (GMT) |
commit | c4dc054ac35a319555e147796f7e57edff7a94e7 (patch) | |
tree | 2bc95389f23559718a9bc945966331fb06d19bb2 | |
parent | 5cc66292964506f3fb71e2b428cc9a7f0ad41ff6 (diff) | |
download | hdf5-c4dc054ac35a319555e147796f7e57edff7a94e7.zip hdf5-c4dc054ac35a319555e147796f7e57edff7a94e7.tar.gz hdf5-c4dc054ac35a319555e147796f7e57edff7a94e7.tar.bz2 |
[svn-r21089] Add dependicies for tests to address issues when run in parallel
-rw-r--r-- | tools/misc/CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt index 148a60f..3e9fe69 100644 --- a/tools/misc/CMakeLists.txt +++ b/tools/misc/CMakeLists.txt @@ -134,11 +134,15 @@ IF (BUILD_TESTING) ${PROJECT_BINARY_DIR}/${resultfile}.out ${PROJECT_BINARY_DIR}/${resultfile}.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5MKGRP-clear-${resultfile}${resultoption} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") ADD_TEST ( NAME H5MKGRP-${resultfile}${resultoption} COMMAND $<TARGET_FILE:h5mkgrp> ${resultoption} ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 ${ARGN} ) SET_TESTS_PROPERTIES (H5MKGRP-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-clear-${resultfile}${resultoption}) + SET (last_test "H5MKGRP-${resultfile}${resultoption}") IF (NOT HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST ( NAME H5MKGRP-h5ls-${resultfile}${resultoption} @@ -153,6 +157,7 @@ IF (BUILD_TESTING) -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) SET_TESTS_PROPERTIES (H5MKGRP-h5ls-${resultfile}${resultoption} PROPERTIES DEPENDS H5MKGRP-${resultfile}${resultoption}) + SET (last_test "H5MKGRP-h5ls-${resultfile}${resultoption}") ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER) ELSE (NOT ${resultoption} STREQUAL " ") ADD_TEST ( @@ -163,11 +168,15 @@ IF (BUILD_TESTING) ${PROJECT_BINARY_DIR}/${resultfile}.out ${PROJECT_BINARY_DIR}/${resultfile}.out.err ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5MKGRP-clear-${resultfile} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") ADD_TEST ( NAME H5MKGRP-${resultfile} COMMAND $<TARGET_FILE:h5mkgrp> ${PROJECT_BINARY_DIR}/../testfiles/${resultfile}.h5 ${ARGN} ) SET_TESTS_PROPERTIES (H5MKGRP-${resultfile} PROPERTIES DEPENDS H5MKGRP-clear-${resultfile}) + SET (last_test "H5MKGRP-${resultfile}") IF (NOT HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST ( NAME H5MKGRP-h5ls-${resultfile} @@ -182,6 +191,7 @@ IF (BUILD_TESTING) -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) SET_TESTS_PROPERTIES (H5MKGRP-h5ls-${resultfile} PROPERTIES DEPENDS H5MKGRP-${resultfile}) + SET (last_test "H5MKGRP-h5ls-${resultfile}") ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER) ENDIF (NOT ${resultoption} STREQUAL " ") ENDMACRO (ADD_H5_TEST resultfile resultcode resultoption) |