mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-18 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r22075] Add test for multiple files with h5ls and h5dump.

Browse Source 
Tested: local linux
This commit is contained in:
Allen Byrne 2012-03-15 15:44:51 -05:00
parent 956fde680a
commit 207c05e2e9
6 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@ -1408,6 +1408,7 @@
./tools/testfiles/tmulti-o.h5
./tools/testfiles/tmulti-r.h5
./tools/testfiles/tmulti-s.h5
./tools/testfiles/tmultifile.ls
./tools/testfiles/tmultifile.ddl
./tools/testfiles/tqmarkfile.ddl
./tools/testfiles/tstarfile.ddl

8
tools/h5dump/CMakeLists.txt
View File

@ -127,7 +127,7 @@ IF (BUILD_TESTING)
tlonglinks.ddl
tloop-1.ddl
tmulti.ddl
# tmultifile.ddl
tmultifile.ddl
# tqmarkfile.ddl
# tstarfile.ddl
tnamed_dtype_attr.ddl
@ -834,8 +834,8 @@ IF (BUILD_TESTING)
tloop-1.out.err
tmulti.out
tmulti.out.err
# tmultifile.out
# tmultifile.out.err
tmultifile.out
tmultifile.out.err
# tqmarkfile.out
# tqmarkfile.out.err
# tstarfile.out
@ -1026,7 +1026,7 @@ IF (BUILD_TESTING)
# test for wildcards in filename (does not work with cmake)
#ADD_H5_MASK_TEST (tstarfile 0 --enable-error-stack -H -d Dataset1 tarr*.h5)
#ADD_H5_MASK_TEST (tqmarkfile 0 --enable-error-stack -H -d Dataset1 tarray?.h5)
#ADD_H5_TEST (tmultifile 0 --enable-error-stack -H -d Dataset1 tarray[2-7].h5)
ADD_H5_TEST (tmultifile 0 --enable-error-stack -H -d Dataset1 tarray2.h5 tarray3.h5 tarray4.h5 tarray5.h5 tarray6.h5 tarray7.h5)
# test for files with empty data
ADD_H5_TEST (tempty 0 --enable-error-stack tempty.h5)

2
tools/h5dump/testh5dump.sh.in
View File

@ -801,7 +801,7 @@ TOOLTEST tarray8.ddl --enable-error-stack tarray8.h5
# test for wildcards in filename (does not work with cmake)
TOOLTEST3 tstarfile --enable-error-stack -H -d Dataset1 tarr*.h5
TOOLTEST3 tqmarkfile --enable-error-stack -H -d Dataset1 tarray?.h5
TOOLTEST tmultifile --enable-error-stack -H -d Dataset1 tarray[2-7].h5
TOOLTEST tmultifile --enable-error-stack -H -d Dataset1 tarray2.h5 tarray3.h5 tarray4.h5 tarray5.h5 tarray6.h5 tarray7.h5
# test for files with empty data
TOOLTEST tempty.ddl --enable-error-stack tempty.h5

6
tools/h5ls/CMakeLists.txt
View File

@ -98,6 +98,7 @@ IF (BUILD_TESTING)
${HDF5_TOOLS_SRC_DIR}/testfiles/tgroup-3.ls
${HDF5_TOOLS_SRC_DIR}/testfiles/thlink-1.ls
${HDF5_TOOLS_SRC_DIR}/testfiles/tloop-1.ls
${HDF5_TOOLS_SRC_DIR}/testfiles/tmultifile.ls
${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-1.ls
${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-2.ls
${HDF5_TOOLS_SRC_DIR}/testfiles/tnestcomp-3.ls
@ -354,6 +355,11 @@ IF (BUILD_TESTING)
# when used file with no dangling links - expected exit code 0
ADD_H5_TEST (thlinks-nodangle-1 0 -w80 --follow-symlinks --no-dangling-links thlink.h5)
# test for wildcards in filename (does not work with cmake)
# ADD_H5_TEST (tstarfile 0 -w80 t*link.h5)
# ADD_H5_TEST (tqmarkfile 0 -w80 t?link.h5)
ADD_H5_TEST (tmultifile 0 -w80 thlink.h5 tslink.h5)
# tests for hard links
ADD_H5_TEST (thlink-1 0 -w80 thlink.h5)

7
tools/h5ls/testh5ls.sh.in
View File

@ -131,6 +131,7 @@ $SRC_H5LS_TESTFILES/tgroup-2.ls
$SRC_H5LS_TESTFILES/tgroup-3.ls
$SRC_H5LS_TESTFILES/thlink-1.ls
$SRC_H5LS_TESTFILES/tloop-1.ls
$SRC_H5LS_TESTFILES/tmultifile.ls
$SRC_H5LS_TESTFILES/tnestcomp-1.ls
$SRC_H5LS_TESTFILES/tnestcomp-2.ls
$SRC_H5LS_TESTFILES/tnestcomp-3.ls
@ -324,9 +325,9 @@ TOOLTEST thlinks-nodangle-1.ls 0 -w80 --follow-symlinks --no-dangling-links thli
# test for wildcards in filename (does not work with cmake)
# this h5ls test script does not pass the filename properly like the h5dump test script???
#TOOLTEST tstarfile t*link.h5
#TOOLTEST tqmarkfile t?link.h5
#TOOLTEST tmultifile t[hs]link.h5
#TOOLTEST tstarfile 0 -w80 t*link.h5
#TOOLTEST tqmarkfile 0 -w80 t?link.h5
TOOLTEST tmultifile 0 -w80 thlink.h5 tslink.h5
# tests for hard links
TOOLTEST thlink-1.ls 0 -w80 thlink.h5

6
tools/testfiles/tmultifile.ls Normal file
View File

@ -0,0 +1,6 @@
dset1 Dataset {5}
g1 Group
g2 Group
g3 Group, same as /
slink1 Soft Link {somevalue}
slink2 Soft Link {linkvalue}