diff options
author | Jonathan Kim <jkm@hdfgroup.org> | 2011-06-03 15:49:16 (GMT) |
---|---|---|
committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-06-03 15:49:16 (GMT) |
commit | 96256669504627e3f29fae2fb29b7c9bc9934c42 (patch) | |
tree | b2da269777d63f3cb46e39eef5081c33c0d92adb /tools | |
parent | 11cdf49515ff3e6236e262bfb0b2c87c70507fca (diff) | |
download | hdf5-96256669504627e3f29fae2fb29b7c9bc9934c42.zip hdf5-96256669504627e3f29fae2fb29b7c9bc9934c42.tar.gz hdf5-96256669504627e3f29fae2fb29b7c9bc9934c42.tar.bz2 |
[svn-r20928] Purpose:
HDFFV-7607: h5ls - improve efficiency of test scripts - removing top 3 extra lines from expected output files
Description:
Merged from hdf5 trunk r20927.
This is a subtask from 'HDFFV-7514 - gmqs: h5dump - improve effectiveness of testing scripts for handling expected output files'.
This is prerequisite for 'HDFFV-7602 tools - upgrade tools' test scripts to share test files among tools, providing framework for test file re-usability.'
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE)
Diffstat (limited to 'tools')
55 files changed, 15 insertions, 175 deletions
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt index 6956c4e..ff1e3c4 100644 --- a/tools/h5ls/CMakeLists.txt +++ b/tools/h5ls/CMakeLists.txt @@ -26,9 +26,9 @@ SET (H5_DEP_EXECUTABLES IF (BUILD_TESTING) # -------------------------------------------------------------------- - # Copy all the HDF5 files from the test directory into the source directory + # Copy all the test files from source directory to test directory # -------------------------------------------------------------------- - SET (HDF5_REFERENCE_FILES + SET (LIST_EXPECT_OUTPUT_FILES help-1.ls help-2.ls help-3.ls @@ -83,7 +83,7 @@ IF (BUILD_TESTING) tvldtypes2le.ls tvldtypes2be.ls ) - SET (HDF5_REFERENCE_TEST_FILES + SET (LIST_HDF5_TEST_FILES tall.h5 tarray1.h5 tattr2.h5 @@ -107,27 +107,29 @@ IF (BUILD_TESTING) tvldtypes1.h5 ) - FOREACH (ls_file ${HDF5_REFERENCE_FILES}) - SET (lsdest "${PROJECT_BINARY_DIR}/${ls_file}") - #MESSAGE (STATUS " Translating ${ls_file}") + # copy the list of expected output files + FOREACH (out_file ${LIST_EXPECT_OUTPUT_FILES}) + SET (out_dest "${PROJECT_BINARY_DIR}/${out_file}") + #MESSAGE (STATUS " Translating ${out_file}") ADD_CUSTOM_COMMAND ( TARGET h5ls POST_BUILD - COMMAND ${XLATE_UTILITY} - ARGS ${HDF5_TOOLS_SRC_DIR}/testfiles/${ls_file} ${lsdest} -l3 + COMMAND ${CMAKE_COMMAND} + ARGS -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/${out_file} ${out_dest} ) - ENDFOREACH (ls_file ${HDF5_REFERENCE_FILES}) + ENDFOREACH (out_file ${LIST_EXPECT_OUTPUT_FILES}) - FOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES}) - SET (dest "${PROJECT_BINARY_DIR}/${h5_file}") + # copy the list of hdf5 test files + FOREACH (h5_file ${LIST_HDF5_TEST_FILES}) + SET (h5_dest "${PROJECT_BINARY_DIR}/${h5_file}") #MESSAGE (STATUS " Copying ${h5_file}") ADD_CUSTOM_COMMAND ( TARGET h5ls POST_BUILD COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/${h5_file} ${dest} + ARGS -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/${h5_file} ${h5_dest} ) - ENDFOREACH (h5_file ${HDF5_REFERENCE_TEST_FILES}) + ENDFOREACH (h5_file ${LIST_HDF5_TEST_FILES}) ############################################################################## ############################################################################## diff --git a/tools/h5ls/testh5ls.sh.in b/tools/h5ls/testh5ls.sh.in index 224e668..798700b 100644 --- a/tools/h5ls/testh5ls.sh.in +++ b/tools/h5ls/testh5ls.sh.in @@ -78,9 +78,6 @@ TOOLTEST() { # any unexpected output from that stream too. TESTING $H5LS $@ ( - echo "#############################" - echo " output for '$H5LS $@'" - echo "#############################" cd $srcdir/../testfiles $RUNSERIAL $H5LS_BIN "$@" ) >$actual 2>$actual_err diff --git a/tools/testfiles/help-1.ls b/tools/testfiles/help-1.ls index e15a88b..aaba608 100644 --- a/tools/testfiles/help-1.ls +++ b/tools/testfiles/help-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -h' -############################# usage: h5ls [OPTIONS] [OBJECTS...] OPTIONS -h, -?, --help Print a usage message and exit diff --git a/tools/testfiles/help-2.ls b/tools/testfiles/help-2.ls index 7d035c0..aaba608 100644 --- a/tools/testfiles/help-2.ls +++ b/tools/testfiles/help-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -help' -############################# usage: h5ls [OPTIONS] [OBJECTS...] OPTIONS -h, -?, --help Print a usage message and exit diff --git a/tools/testfiles/help-3.ls b/tools/testfiles/help-3.ls index 8de1003..aaba608 100644 --- a/tools/testfiles/help-3.ls +++ b/tools/testfiles/help-3.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -?' -############################# usage: h5ls [OPTIONS] [OBJECTS...] OPTIONS -h, -?, --help Print a usage message and exit diff --git a/tools/testfiles/nosuchfile.ls b/tools/testfiles/nosuchfile.ls index 8d5855e..8c4ee42 100644 --- a/tools/testfiles/nosuchfile.ls +++ b/tools/testfiles/nosuchfile.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls nosuchfile.h5' -############################# nosuchfile.h5: unable to open file diff --git a/tools/testfiles/tall-1.ls b/tools/testfiles/tall-1.ls index 6bdb7e7..91b89e6 100644 --- a/tools/testfiles/tall-1.ls +++ b/tools/testfiles/tall-1.ls @@ -1,5 +1,2 @@ -############################# - output for 'h5ls -w80 tall.h5' -############################# g1 Group g2 Group diff --git a/tools/testfiles/tall-2.ls b/tools/testfiles/tall-2.ls index 61b8cfb..2d3d66b 100644 --- a/tools/testfiles/tall-2.ls +++ b/tools/testfiles/tall-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tall.h5' -############################# / Group /g1 Group /g1/g1.1 Group diff --git a/tools/testfiles/tarray1.ls b/tools/testfiles/tarray1.ls index 60c002d..973a4e2 100644 --- a/tools/testfiles/tarray1.ls +++ b/tools/testfiles/tarray1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tarray1.h5' -############################# / Group /Dataset1 Dataset {4} Data: diff --git a/tools/testfiles/tattr2.ls b/tools/testfiles/tattr2.ls index 0448868..eb7c739 100644 --- a/tools/testfiles/tattr2.ls +++ b/tools/testfiles/tattr2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -v -S tattr2.h5' -############################# Opened "tattr2.h5" with sec2 driver. dset Dataset {2/2} Attribute: array {2} diff --git a/tools/testfiles/tcomp-1.ls b/tools/testfiles/tcomp-1.ls index 9cfb47d..a3969bd 100644 --- a/tools/testfiles/tcomp-1.ls +++ b/tools/testfiles/tcomp-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tcompound.h5' -############################# / Group /dset1 Dataset {5} Data: diff --git a/tools/testfiles/tdataregbe.ls b/tools/testfiles/tdataregbe.ls index 47b6994..b9dd8f2 100644 --- a/tools/testfiles/tdataregbe.ls +++ b/tools/testfiles/tdataregbe.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -v tdatareg.h5' -############################# Opened "tdatareg.h5" with sec2 driver. Dataset1 Dataset {4/4} Location: 1:1284 diff --git a/tools/testfiles/tdataregle.ls b/tools/testfiles/tdataregle.ls index b07b274..915f371 100644 --- a/tools/testfiles/tdataregle.ls +++ b/tools/testfiles/tdataregle.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -v tdatareg.h5' -############################# Opened "tdatareg.h5" with sec2 driver. Dataset1 Dataset {4/4} Location: 1:1284 diff --git a/tools/testfiles/tdset-1.ls b/tools/testfiles/tdset-1.ls index b6e4671..130c3ef 100644 --- a/tools/testfiles/tdset-1.ls +++ b/tools/testfiles/tdset-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tdset.h5' -############################# / Group /dset1 Dataset {10, 20} Data: diff --git a/tools/testfiles/tempty.ls b/tools/testfiles/tempty.ls index 96ea64a..38ecb55 100644 --- a/tools/testfiles/tempty.ls +++ b/tools/testfiles/tempty.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -d tempty.h5' -############################# Dataset1.0 Dataset {4} Data: (0) (), (), (), () diff --git a/tools/testfiles/textlink-1.ls b/tools/testfiles/textlink-1.ls index c159483..a49001f 100644 --- a/tools/testfiles/textlink-1.ls +++ b/tools/testfiles/textlink-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r textlink.h5' -############################# / Group /extlink1 External Link {filename//objname} /extlink2 External Link {anotherfile//anotherobj} diff --git a/tools/testfiles/textlinksrc-1-old.ls b/tools/testfiles/textlinksrc-1-old.ls index 488c9cf..ef26cc4 100644 --- a/tools/testfiles/textlinksrc-1-old.ls +++ b/tools/testfiles/textlinksrc-1-old.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -Er textlinksrc.h5' -############################# / Group /ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} /ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} diff --git a/tools/testfiles/textlinksrc-1.ls b/tools/testfiles/textlinksrc-1.ls index 8d946d7..ef26cc4 100644 --- a/tools/testfiles/textlinksrc-1.ls +++ b/tools/testfiles/textlinksrc-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks -r textlinksrc.h5' -############################# / Group /ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} /ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} diff --git a/tools/testfiles/textlinksrc-2-old.ls b/tools/testfiles/textlinksrc-2-old.ls index 403a1d2..a3044dd 100644 --- a/tools/testfiles/textlinksrc-2-old.ls +++ b/tools/testfiles/textlinksrc-2-old.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -Erv textlinksrc.h5/ext_link5' -############################# Opened "textlinksrc.h5" with sec2 driver. ext_link5 External Link {textlinktar.h5//empty_group} {Group Location: 5:1832 diff --git a/tools/testfiles/textlinksrc-2.ls b/tools/testfiles/textlinksrc-2.ls index 1e92f59..a3044dd 100644 --- a/tools/testfiles/textlinksrc-2.ls +++ b/tools/testfiles/textlinksrc-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks -rv textlinksrc.h5/ext_link5' -############################# Opened "textlinksrc.h5" with sec2 driver. ext_link5 External Link {textlinktar.h5//empty_group} {Group Location: 5:1832 diff --git a/tools/testfiles/textlinksrc-3-old.ls b/tools/testfiles/textlinksrc-3-old.ls index c10cc1d..75f3421 100644 --- a/tools/testfiles/textlinksrc-3-old.ls +++ b/tools/testfiles/textlinksrc-3-old.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -Er textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} {Group} /dset Dataset {6} /elink_t1 External Link {textlinksrc.h5//} {Group} diff --git a/tools/testfiles/textlinksrc-3.ls b/tools/testfiles/textlinksrc-3.ls index fc3c6a2..75f3421 100644 --- a/tools/testfiles/textlinksrc-3.ls +++ b/tools/testfiles/textlinksrc-3.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks -r textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} {Group} /dset Dataset {6} /elink_t1 External Link {textlinksrc.h5//} {Group} diff --git a/tools/testfiles/textlinksrc-4.ls b/tools/testfiles/textlinksrc-4.ls index 4e9414e..449830f 100644 --- a/tools/testfiles/textlinksrc-4.ls +++ b/tools/testfiles/textlinksrc-4.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r textlinksrc.h5' -############################# / Group /ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} /ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} diff --git a/tools/testfiles/textlinksrc-5.ls b/tools/testfiles/textlinksrc-5.ls index a1d61d7..8cba586 100644 --- a/tools/testfiles/textlinksrc-5.ls +++ b/tools/testfiles/textlinksrc-5.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls -w80 -r textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} diff --git a/tools/testfiles/textlinksrc-6-old.ls b/tools/testfiles/textlinksrc-6-old.ls index 578e78e..ae70721 100644 --- a/tools/testfiles/textlinksrc-6-old.ls +++ b/tools/testfiles/textlinksrc-6-old.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -E textlinksrc.h5' -############################# ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} ext_link1 External Link {textlinktar.h5//group} {Group} diff --git a/tools/testfiles/textlinksrc-6.ls b/tools/testfiles/textlinksrc-6.ls index b8ea95e..ae70721 100644 --- a/tools/testfiles/textlinksrc-6.ls +++ b/tools/testfiles/textlinksrc-6.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks textlinksrc.h5' -############################# ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} ext_link1 External Link {textlinktar.h5//group} {Group} diff --git a/tools/testfiles/textlinksrc-7-old.ls b/tools/testfiles/textlinksrc-7-old.ls index 9249d0c..e9a5a03 100644 --- a/tools/testfiles/textlinksrc-7-old.ls +++ b/tools/testfiles/textlinksrc-7-old.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls -w80 -E textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} {Group} diff --git a/tools/testfiles/textlinksrc-7.ls b/tools/testfiles/textlinksrc-7.ls index 528c4c5..e9a5a03 100644 --- a/tools/testfiles/textlinksrc-7.ls +++ b/tools/testfiles/textlinksrc-7.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls -w80 --follow-symlinks textlinksrc.h5/ext_link1' -############################# ext_link1 External Link {textlinktar.h5//group} {Group} diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/testfiles/textlinksrc-nodangle-1.ls index 9240761..7427e1c 100644 --- a/tools/testfiles/textlinksrc-nodangle-1.ls +++ b/tools/testfiles/textlinksrc-nodangle-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --no-dangling-links textlinksrc.h5' -############################# Error: --no-dangling-links must be used along with --follow-symlinks option! usage: h5ls [OPTIONS] [OBJECTS...] diff --git a/tools/testfiles/textlinksrc-nodangle-2.ls b/tools/testfiles/textlinksrc-nodangle-2.ls index e483dd1..ae70721 100644 --- a/tools/testfiles/textlinksrc-nodangle-2.ls +++ b/tools/testfiles/textlinksrc-nodangle-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks --no-dangling-links textlinksrc.h5' -############################# ext2soft_link1 External Link {tsoftlinks.h5//soft_dset1} {Dataset {4, 2}} ext2softdangle_link1 External Link {tsoftlinks.h5//soft_dangle} {**NOT FOUND**} ext_link1 External Link {textlinktar.h5//group} {Group} diff --git a/tools/testfiles/tgroup-1.ls b/tools/testfiles/tgroup-1.ls index 04066ca..effaf5a 100644 --- a/tools/testfiles/tgroup-1.ls +++ b/tools/testfiles/tgroup-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -g tgroup.h5' -############################# Error: 'recursive' option not compatible with 'group info' option! usage: h5ls [OPTIONS] [OBJECTS...] diff --git a/tools/testfiles/tgroup-2.ls b/tools/testfiles/tgroup-2.ls index 0817d93..464d4d7 100644 --- a/tools/testfiles/tgroup-2.ls +++ b/tools/testfiles/tgroup-2.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls -w80 -g tgroup.h5/g1' -############################# g1 Group diff --git a/tools/testfiles/tgroup-3.ls b/tools/testfiles/tgroup-3.ls index cfb479a..959415f 100644 --- a/tools/testfiles/tgroup-3.ls +++ b/tools/testfiles/tgroup-3.ls @@ -1,5 +1,2 @@ -############################# - output for 'h5ls -w80 tgroup.h5/g1' -############################# g1.1 Group g1.2 Group diff --git a/tools/testfiles/tgroup.ls b/tools/testfiles/tgroup.ls index 5e4b66d..549b166 100644 --- a/tools/testfiles/tgroup.ls +++ b/tools/testfiles/tgroup.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 tgroup.h5' -############################# g1 Group g2 Group g3 Group diff --git a/tools/testfiles/tgrp_comments.ls b/tools/testfiles/tgrp_comments.ls index e4c7d42..c36a819 100644 --- a/tools/testfiles/tgrp_comments.ls +++ b/tools/testfiles/tgrp_comments.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -v -g tgrp_comments.h5/glongcomment' -############################# Opened "tgrp_comments.h5" with sec2 driver. glongcomment Group Location: 1:12424 diff --git a/tools/testfiles/thlink-1.ls b/tools/testfiles/thlink-1.ls index 01839bf..adcd38a 100644 --- a/tools/testfiles/thlink-1.ls +++ b/tools/testfiles/thlink-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 thlink.h5' -############################# dset1 Dataset {5} g1 Group g2 Group diff --git a/tools/testfiles/thlinks-nodangle-1.ls b/tools/testfiles/thlinks-nodangle-1.ls index 37ba6b0..adcd38a 100644 --- a/tools/testfiles/thlinks-nodangle-1.ls +++ b/tools/testfiles/thlinks-nodangle-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks --no-dangling-links thlink.h5' -############################# dset1 Dataset {5} g1 Group g2 Group diff --git a/tools/testfiles/tloop-1.ls b/tools/testfiles/tloop-1.ls index 22cb6c7..a68bd3b 100644 --- a/tools/testfiles/tloop-1.ls +++ b/tools/testfiles/tloop-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tloop.h5' -############################# / Group /g1 Group /g1/g1.1 Group diff --git a/tools/testfiles/tnestcomp-1.ls b/tools/testfiles/tnestcomp-1.ls index 9dc193d..425d92f 100644 --- a/tools/testfiles/tnestcomp-1.ls +++ b/tools/testfiles/tnestcomp-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tnestedcomp.h5' -############################# / Group /ArrayOfStructures Dataset {10} Data: diff --git a/tools/testfiles/tnestcomp-2.ls b/tools/testfiles/tnestcomp-2.ls index be60e8d..64be630 100644 --- a/tools/testfiles/tnestcomp-2.ls +++ b/tools/testfiles/tnestcomp-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d -S tnestedcomp.h5' -############################# / Group /ArrayOfStructures Dataset {10} Data: diff --git a/tools/testfiles/tnestcomp-3.ls b/tools/testfiles/tnestcomp-3.ls index 98eca8e..0a230cc 100644 --- a/tools/testfiles/tnestcomp-3.ls +++ b/tools/testfiles/tnestcomp-3.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d -l tnestedcomp.h5' -############################# / Group /ArrayOfStructures Dataset {10} Data: diff --git a/tools/testfiles/tnestcomp-4.ls b/tools/testfiles/tnestcomp-4.ls index 6618597..d937e86 100644 --- a/tools/testfiles/tnestcomp-4.ls +++ b/tools/testfiles/tnestcomp-4.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d -l -S tnestedcomp.h5' -############################# / Group /ArrayOfStructures Dataset {10} Data: diff --git a/tools/testfiles/tsaf.ls b/tools/testfiles/tsaf.ls index 96d4811..c950d7d 100644 --- a/tools/testfiles/tsaf.ls +++ b/tools/testfiles/tsaf.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tsaf.h5' -############################# / Group /.DSL_METADATA Dataset {5919/Inf} Data: diff --git a/tools/testfiles/tslink-1.ls b/tools/testfiles/tslink-1.ls index 6c3467a..7afc8a5 100644 --- a/tools/testfiles/tslink-1.ls +++ b/tools/testfiles/tslink-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r tslink.h5' -############################# / Group /slink1 Soft Link {somevalue} /slink2 Soft Link {linkvalue} diff --git a/tools/testfiles/tsoftlinks-1.ls b/tools/testfiles/tsoftlinks-1.ls index fc57da9..d7d98a3 100644 --- a/tools/testfiles/tsoftlinks-1.ls +++ b/tools/testfiles/tsoftlinks-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls --follow-symlinks tsoftlinks.h5' -############################# dset1 Dataset {4, 2} dset2 Dataset {4, 2} dtype Type diff --git a/tools/testfiles/tsoftlinks-2.ls b/tools/testfiles/tsoftlinks-2.ls index 3566f70..52c5265 100644 --- a/tools/testfiles/tsoftlinks-2.ls +++ b/tools/testfiles/tsoftlinks-2.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls --follow-symlinks -r tsoftlinks.h5' -############################# / Group /dset1 Dataset {4, 2} /dset2 Dataset {4, 2} diff --git a/tools/testfiles/tsoftlinks-3.ls b/tools/testfiles/tsoftlinks-3.ls index 2face70..6b958ac 100644 --- a/tools/testfiles/tsoftlinks-3.ls +++ b/tools/testfiles/tsoftlinks-3.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls --follow-symlinks tsoftlinks.h5/group1' -############################# soft_dangle Soft Link {not_yet} {**NOT FOUND**} soft_dset1 Soft Link {/dset1} {Dataset {4, 2}} soft_dset2 Soft Link {/dset2} {Dataset {4, 2}} diff --git a/tools/testfiles/tsoftlinks-4.ls b/tools/testfiles/tsoftlinks-4.ls index c1f4568..092d8a5 100644 --- a/tools/testfiles/tsoftlinks-4.ls +++ b/tools/testfiles/tsoftlinks-4.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls --follow-symlinks -r tsoftlinks.h5/group1' -############################# /soft_dangle Soft Link {not_yet} {**NOT FOUND**} /soft_dset1 Soft Link {/dset1} {Dataset {4, 2}} /soft_dset2 Soft Link {/dset2} {Dataset {4, 2}} diff --git a/tools/testfiles/tsoftlinks-5.ls b/tools/testfiles/tsoftlinks-5.ls index 6e915e1..cc1f130 100644 --- a/tools/testfiles/tsoftlinks-5.ls +++ b/tools/testfiles/tsoftlinks-5.ls @@ -1,4 +1 @@ -############################# - output for 'h5ls --follow-symlinks tsoftlinks.h5/soft_dset1' -############################# soft_dset1 Soft Link {/dset1} {Dataset {4, 2}} diff --git a/tools/testfiles/tsoftlinks-nodangle-1.ls b/tools/testfiles/tsoftlinks-nodangle-1.ls index 6d639b7..d7d98a3 100644 --- a/tools/testfiles/tsoftlinks-nodangle-1.ls +++ b/tools/testfiles/tsoftlinks-nodangle-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 --follow-symlinks --no-dangling-links tsoftlinks.h5' -############################# dset1 Dataset {4, 2} dset2 Dataset {4, 2} dtype Type diff --git a/tools/testfiles/tstr-1.ls b/tools/testfiles/tstr-1.ls index 8a223cc..1ae4ecd 100644 --- a/tools/testfiles/tstr-1.ls +++ b/tools/testfiles/tstr-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tstr.h5' -############################# / Group /comp1 Dataset {3, 6} Data: diff --git a/tools/testfiles/tudlink-1.ls b/tools/testfiles/tudlink-1.ls index d34ef4d..487e4bc 100644 --- a/tools/testfiles/tudlink-1.ls +++ b/tools/testfiles/tudlink-1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r tudlink.h5' -############################# / Group /udlink1 UD Link {cannot follow UD links} /udlink2 UD Link {cannot follow UD links} diff --git a/tools/testfiles/tvldtypes1.ls b/tools/testfiles/tvldtypes1.ls index 4c4c162..feb1ac6 100644 --- a/tools/testfiles/tvldtypes1.ls +++ b/tools/testfiles/tvldtypes1.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -w80 -r -d tvldtypes1.h5' -############################# / Group /Dataset1.0 Dataset {4} Data: diff --git a/tools/testfiles/tvldtypes2be.ls b/tools/testfiles/tvldtypes2be.ls index ee84185..2f7def3 100644 --- a/tools/testfiles/tvldtypes2be.ls +++ b/tools/testfiles/tvldtypes2be.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -v tvldtypes1.h5' -############################# Opened "tvldtypes1.h5" with sec2 driver. Dataset1.0 Dataset {4/4} Location: 1:976 diff --git a/tools/testfiles/tvldtypes2le.ls b/tools/testfiles/tvldtypes2le.ls index 62dfa61..f99ad18 100644 --- a/tools/testfiles/tvldtypes2le.ls +++ b/tools/testfiles/tvldtypes2le.ls @@ -1,6 +1,3 @@ -############################# - output for 'h5ls -v tvldtypes1.h5' -############################# Opened "tvldtypes1.h5" with sec2 driver. Dataset1.0 Dataset {4/4} Location: 1:976 |