diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-02-22 14:55:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-02-22 14:55:04 (GMT) |
| commit | 5d320f5c89fdb0a830a9f435e32c3cde3a8bd863 (patch) | |
| tree | a79e9e3fbda396ebdf70e67b82d75144449af07d /tools/h5repack | |
| parent | cab5c372bfc34773014c13a38ca8dc30d5a89441 (diff) | |
| download | hdf5-5d320f5c89fdb0a830a9f435e32c3cde3a8bd863.zip hdf5-5d320f5c89fdb0a830a9f435e32c3cde3a8bd863.tar.gz hdf5-5d320f5c89fdb0a830a9f435e32c3cde3a8bd863.tar.bz2 | |
[svn-r20141] Bring 1.8 r20139 cmake and windows changes to trunk
Diffstat (limited to 'tools/h5repack')
| -rw-r--r-- | tools/h5repack/CMakeLists.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt index f24c7be..92933d4 100644 --- a/tools/h5repack/CMakeLists.txt +++ b/tools/h5repack/CMakeLists.txt @@ -59,6 +59,7 @@ IF (BUILD_TESTING) TARGET_LINK_LIBRARIES (h5repacktest ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET}) ADD_TEST (NAME h5repacktest COMMAND $<TARGET_FILE:h5repacktest>) + SET_TESTS_PROPERTIES (h5repacktest PROPERTIES DEPENDS testh5repack_detect_szip) IF (HDF5_TEST_VFD) @@ -177,10 +178,15 @@ IF (BUILD_TESTING) NAME H5REPACK-${testname} COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out.${testfile} ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5REPACK-${testname} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") ADD_TEST ( NAME H5REPACK-DIFF_${testname} COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out.${testfile} ) + SET_TESTS_PROPERTIES (H5REPACK-DIFF_${testname} PROPERTIES DEPENDS H5REPACK-${testname}) + SET (last_test "H5REPACK-DIFF_${testname}") ENDIF (${testtype} STREQUAL "SKIP") ENDMACRO (ADD_H5_TEST) @@ -203,6 +209,10 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=testfiles/${resultfile}.ddl" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5REPACK-${testname} PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5REPACK-${testname}") ENDIF (${testtype} STREQUAL "SKIP") ENDMACRO (ADD_H5_CMP_TEST) @@ -226,6 +236,8 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${testfilter}" -P "${HDF5_RESOURCES_DIR}/grepTest.cmake" ) + SET_TESTS_PROPERTIES (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS H5REPACK-${testname}) + SET (last_test "H5REPACK_VERIFY_LAYOUT-${testname}") ELSE (${resultcode} STREQUAL "0") IF (${testfilter} STREQUAL "CHUNKED") SET (nottestfilter "(CONTIGUOUS|COMPACT)") @@ -248,6 +260,8 @@ IF (BUILD_TESTING) -D "TEST_REFERENCE=${testfilter}" -P "${HDF5_RESOURCES_DIR}/grepTest.cmake" ) + SET_TESTS_PROPERTIES (H5REPACK_VERIFY_LAYOUT_ALL-${testname} PROPERTIES DEPENDS H5REPACK-${testname}) + SET (last_test "H5REPACK_VERIFY_LAYOUT-${testname}") ENDIF (${resultcode} STREQUAL "0") ENDIF (${testtype} STREQUAL "SKIP") ENDMACRO (ADD_H5_VERIFY_TEST) @@ -323,6 +337,10 @@ IF (BUILD_TESTING) h5repack_ub_out.h5 h5repack_attr_refs_out.h5 ) + IF (NOT "${last_test}" STREQUAL "") + SET_TESTS_PROPERTIES (H5REPACK-clearall-objects PROPERTIES DEPENDS ${last_test}) + ENDIF (NOT "${last_test}" STREQUAL "") + SET (last_test "H5REPACK-clearall-objects") # -------------------------------------------------------------------- # test file names |