From eddfc8bbc348e7a5064136ff9fc715698d0aabbe Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 11 Jul 2011 10:17:25 -0500 Subject: [svn-r21088] Add dependicies for tests to address issues when run in parallel --- tools/misc/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 $ ${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 $ ${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) -- cgit v0.12