diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-03-19 16:02:24 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-03-19 16:02:24 (GMT) |
| commit | 64a17e9f7c7759bc6971219dd26491dac4674b86 (patch) | |
| tree | 82b1d243bf63d601c1945ccadb263165c40061ca | |
| parent | 1b68d081163cb125f1ae733c893d08840467be48 (diff) | |
| download | hdf5-64a17e9f7c7759bc6971219dd26491dac4674b86.zip hdf5-64a17e9f7c7759bc6971219dd26491dac4674b86.tar.gz hdf5-64a17e9f7c7759bc6971219dd26491dac4674b86.tar.bz2 | |
[svn-r20283] Bring test properties changes from r20282 of trunk
| -rw-r--r-- | tools/h5copy/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tools/misc/CMakeLists.txt | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt index f2f0490..9ce1558 100644 --- a/tools/h5copy/CMakeLists.txt +++ b/tools/h5copy/CMakeLists.txt @@ -152,6 +152,9 @@ IF (BUILD_TESTING) # If using memchecker add tests without using scripts IF (HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST (NAME H5COPY-CMP-${testname} COMMAND $<TARGET_FILE:h5copy> -i ${testfile}.h5 -o ./testfiles/${testfile}.out.h5 -${vparam} -s ${srcname} -d ${dstname}) + IF (${resultcode} STREQUAL "1") + SET_TESTS_PROPERTIES (H5COPY-CMP-${testname} PROPERTIES WILL_FAIL "true") + ENDIF (${resultcode} STREQUAL "1") ELSE (HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST ( NAME H5COPY-CMP-${testname} diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt index 6c62d62..935239d 100644 --- a/tools/misc/CMakeLists.txt +++ b/tools/misc/CMakeLists.txt @@ -207,6 +207,7 @@ IF (BUILD_TESTING) scd_family00002.h5 scd_family00003.h5 ) + SET_TESTS_PROPERTIES (h5repart_5K-clear-objects PROPERTIES DEPENDS h5repart_20K) # repartition family member size to 5 KB. ADD_TEST (NAME h5repart_5K COMMAND $<TARGET_FILE:h5repart> -m 5k family_file%05d.h5 scd_family%05d.h5) SET_TESTS_PROPERTIES (h5repart_5K PROPERTIES DEPENDS h5repart_5K-clear-objects) @@ -218,24 +219,19 @@ IF (BUILD_TESTING) -E remove family_to_sec2.h5 ) + SET_TESTS_PROPERTIES (h5repart_sec2-clear-objects PROPERTIES DEPENDS h5repart_5K) # convert family file to sec2 file of 20,000 bytes ADD_TEST (NAME h5repart_sec2 COMMAND $<TARGET_FILE:h5repart> -m 20000 -family_to_sec2 family_file%05d.h5 family_to_sec2.h5) SET_TESTS_PROPERTIES (h5repart_sec2 PROPERTIES DEPENDS h5repart_sec2-clear-objects) # test the output files repartitioned above. ADD_TEST (NAME h5repart_test COMMAND $<TARGET_FILE:h5repart_test>) - SET_TESTS_PROPERTIES (h5repart_test PROPERTIES DEPENDS h5repart_sec2 h5repart_5K h5repart_20K) + SET_TESTS_PROPERTIES (h5repart_test PROPERTIES DEPENDS h5repart_sec2) SET (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5repart_test ) - # If using memchecker add tests without using scripts - IF (HDF5_ENABLE_USING_MEMCHECKER) - ADD_TEST (NAME H5MKGRP-help COMMAND h5mkgrp -h) - ADD_TEST (NAME H5MKGRP-version COMMAND h5mkgrp -V) - ENDIF (HDF5_ENABLE_USING_MEMCHECKER) - # Check that help & version is displayed properly ADD_H5_CMP (h5mkgrp_help 0 "-h") ADD_H5_CMP (h5mkgrp_version 0 "-V") |