diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-03-18 13:58:18 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-03-18 13:58:18 (GMT) |
| commit | e038bf6eb718711c76a86074848e96a8158a12bd (patch) | |
| tree | f76d253d98de3a5109bee70c6c80c43da3b4646f /tools/h5dump | |
| parent | e8d97aef7dfda3da6ceb599828fd641fa26cd8a9 (diff) | |
| download | hdf5-e038bf6eb718711c76a86074848e96a8158a12bd.zip hdf5-e038bf6eb718711c76a86074848e96a8158a12bd.tar.gz hdf5-e038bf6eb718711c76a86074848e96a8158a12bd.tar.bz2 | |
[svn-r20267] Corrected expected fail tests for use during valgrind
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/CMakeLists.txt | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index b3d151f..92c7149 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -414,6 +414,9 @@ IF (BUILD_TESTING) # If using memchecker add tests without using scripts IF (HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump> ${ARGN}) + IF (NOT ${resultcode} STREQUAL "0") + SET_TESTS_PROPERTIES (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true") + ENDIF (NOT ${resultcode} STREQUAL "0") ELSE (HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST ( NAME H5DUMP-${resultfile} @@ -492,6 +495,9 @@ IF (BUILD_TESTING) MACRO (ADD_XML_H5_TEST resultfile resultcode) IF (HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST (NAME H5DUMP-XML-${resultfile} COMMAND $<TARGET_FILE:h5dump> --xml ${ARGN}) + IF (NOT ${resultcode} STREQUAL "0") + SET_TESTS_PROPERTIES (H5DUMP-XML-${resultfile} PROPERTIES WILL_FAIL "true") + ENDIF (NOT ${resultcode} STREQUAL "0") ELSE (HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST ( NAME H5DUMP-XML-${resultfile} @@ -771,17 +777,11 @@ IF (BUILD_TESTING) ADD_H5_TEST (tgroup-1 0 tgroup.h5) # test for displaying the selected groups ADD_H5_TEST (tgroup-2 1 --group=/g2 --group / -g /y tgroup.h5) - IF (HDF5_ENABLE_USING_MEMCHECKER) - SET_TESTS_PROPERTIES (H5DUMP-tgroup-2 PROPERTIES WILL_FAIL "true") - ENDIF (HDF5_ENABLE_USING_MEMCHECKER) # test for displaying simple space datasets ADD_H5_TEST (tdset-1 0 tdset.h5) # test for displaying selected datasets ADD_H5_TEST (tdset-2 1 -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5) - IF (HDF5_ENABLE_USING_MEMCHECKER) - SET_TESTS_PROPERTIES (H5DUMP-tdset-2 PROPERTIES WILL_FAIL "true") - ENDIF (HDF5_ENABLE_USING_MEMCHECKER) # test for displaying attributes ADD_H5_TEST (tattr-1 0 tattr.h5) @@ -789,9 +789,6 @@ IF (BUILD_TESTING) ADD_H5_TEST (tattr-2 0 -a /attr1 --attribute /attr4 --attribute=/attr5 tattr.h5) # test for header and error messages ADD_H5_TEST (tattr-3 1 --header -a /attr2 --attribute=/attr tattr.h5) - IF (HDF5_ENABLE_USING_MEMCHECKER) - SET_TESTS_PROPERTIES (H5DUMP-tattr-3 PROPERTIES WILL_FAIL "true") - ENDIF (HDF5_ENABLE_USING_MEMCHECKER) # test for displaying attributes in shared datatype (also in group and dataset) ADD_H5_TEST (tnamed_dtype_attr 0 tnamed_dtype_attr.h5) @@ -889,9 +886,6 @@ IF (BUILD_TESTING) # test failure handling # Missing file name ADD_H5_TEST (tnofilename 1) - IF (HDF5_ENABLE_USING_MEMCHECKER) - SET_TESTS_PROPERTIES (H5DUMP-tnofilename PROPERTIES WILL_FAIL "true") - ENDIF (HDF5_ENABLE_USING_MEMCHECKER) # rev. 2004 @@ -901,9 +895,6 @@ IF (BUILD_TESTING) # test -p with a non existing dataset ADD_H5_TEST (tperror 1 -p -d bogus tfcontents1.h5) - IF (HDF5_ENABLE_USING_MEMCHECKER) - SET_TESTS_PROPERTIES (H5DUMP-tperror PROPERTIES WILL_FAIL "true") - ENDIF (HDF5_ENABLE_USING_MEMCHECKER) # test for file contents ADD_H5_TEST (tcontents 0 -n tfcontents1.h5) @@ -1266,16 +1257,6 @@ IF (BUILD_TESTING) SET (last_test "H5DUMP-XML-clearall-objects") ########## test XML - - # If using memchecker add tests without using scripts - IF (HDF5_ENABLE_USING_MEMCHECKER) - ADD_TEST (NAME H5DUMP-XML-tgroup COMMAND h5dump --xml tgroup.h5) - ADD_TEST (NAME H5DUMP-XML-tdset COMMAND h5dump --xml tdset.h5) - ADD_TEST (NAME H5DUMP-XML-tattr COMMAND h5dump --xml tattr.h5) - ADD_TEST (NAME H5DUMP-XML-tslink COMMAND h5dump --xml tslink.h5) - ADD_TEST (NAME H5DUMP-XML-thlink COMMAND h5dump --xml thlink.h5) - ENDIF (HDF5_ENABLE_USING_MEMCHECKER) - ADD_XML_H5_TEST (tall.h5 0 tall.h5) ADD_XML_H5_TEST (tattr.h5 0 tattr.h5) ADD_XML_H5_TEST (tbitfields.h5 0 tbitfields.h5) |