summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2012-03-15 20:44:51 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2012-03-15 20:44:51 (GMT)
commit207c05e2e9f1c2844416c19fe5b74b2d71610fd1 (patch)
treec19592659592a26a552c777222be20328becd189
parent956fde680a35b1fbc19fa5ff1367fcf8eb54c194 (diff)
downloadhdf5-207c05e2e9f1c2844416c19fe5b74b2d71610fd1.zip
hdf5-207c05e2e9f1c2844416c19fe5b74b2d71610fd1.tar.gz
hdf5-207c05e2e9f1c2844416c19fe5b74b2d71610fd1.tar.bz2
[svn-r22075] Add test for multiple files with h5ls and h5dump.
Tested: local linux
-rw-r--r--MANIFEST1
-rw-r--r--tools/h5dump/CMakeLists.txt8
-rw-r--r--tools/h5dump/testh5dump.sh.in2
-rw-r--r--tools/h5ls/CMakeLists.txt6
-rw-r--r--tools/h5ls/testh5ls.sh.in7
-rw-r--r--tools/testfiles/tmultifile.ls6
6 files changed, 22 insertions, 8 deletions
diff --git a/MANIFEST b/MANIFEST
index 91c4ce5..f30ea30 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -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
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index a257fc0..a6e452d 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -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)
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index ae28df6..68052a6 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -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
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index 599202f..0dec21c 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -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)
diff --git a/tools/h5ls/testh5ls.sh.in b/tools/h5ls/testh5ls.sh.in
index e79be02..3f84ac5 100644
--- a/tools/h5ls/testh5ls.sh.in
+++ b/tools/h5ls/testh5ls.sh.in
@@ -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
diff --git a/tools/testfiles/tmultifile.ls b/tools/testfiles/tmultifile.ls
new file mode 100644
index 0000000..3fee937
--- /dev/null
+++ b/tools/testfiles/tmultifile.ls
@@ -0,0 +1,6 @@
+dset1 Dataset {5}
+g1 Group
+g2 Group
+g3 Group, same as /
+slink1 Soft Link {somevalue}
+slink2 Soft Link {linkvalue}