diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-08-22 19:57:31 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-08-22 19:57:31 (GMT) |
| commit | e86655bbf4e707ba93406022350f15688f85c0d7 (patch) | |
| tree | 636a3cabc3cbbf3d68ea0f230b54d0b0575c9b8a /tools/h5dump | |
| parent | 7e0bc290129ac8b90a43b563294db4e7eb359078 (diff) | |
| download | hdf5-e86655bbf4e707ba93406022350f15688f85c0d7.zip hdf5-e86655bbf4e707ba93406022350f15688f85c0d7.tar.gz hdf5-e86655bbf4e707ba93406022350f15688f85c0d7.tar.bz2 | |
[svn-r24057] Add --superblock long name to parser and add tests for both --boot-block and --superblock.
Tested: local linux
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/CMakeTests.cmake | 8 | ||||
| -rw-r--r-- | tools/h5dump/h5dump.c | 1 | ||||
| -rw-r--r-- | tools/h5dump/testh5dump.sh.in | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake index 026b6b2..c88495d 100644 --- a/tools/h5dump/CMakeTests.cmake +++ b/tools/h5dump/CMakeTests.cmake @@ -52,6 +52,8 @@ ${HDF5_TOOLS_SRC_DIR}/testfiles/tbigdims.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot1.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot2.ddl + ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot2A.ddl + ${HDF5_TOOLS_SRC_DIR}/testfiles/tboot2B.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tchar1.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tchunked.ddl ${HDF5_TOOLS_SRC_DIR}/testfiles/tcmpdattrintsize.ddl @@ -797,6 +799,10 @@ tboot1.out.err tboot2.out tboot2.out.err + tboot2A.out + tboot2A.out.err + tboot2B.out + tboot2B.out.err tchar1.out tchar1.out.err tchunked.out @@ -1202,6 +1208,8 @@ # tests for super block ADD_H5_TEST (tboot1 0 --enable-error-stack -H -B -d dset tfcontents1.h5) ADD_H5_TEST (tboot2 0 --enable-error-stack -B tfcontents2.h5) + ADD_H5_TEST (tboot2A 0 --enable-error-stack --boot-block tfcontents2.h5) + ADD_H5_TEST (tboot2B 0 --enable-error-stack --superblock tfcontents2.h5) ADD_H5_TEST (file_space 0 --enable-error-stack -B file_space.h5) # test -p with a non existing dataset diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index ea38c61..6429041 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -77,6 +77,7 @@ static struct long_options l_opts[] = { { "hel", no_arg, 'h' }, { "contents", optional_arg, 'n' }, { "properties", no_arg, 'p' }, + { "superblock", no_arg, 'B' }, { "boot-block", no_arg, 'B' }, { "boot-bloc", no_arg, 'B' }, { "boot-blo", no_arg, 'B' }, diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in index 77a0113..be05705 100644 --- a/tools/h5dump/testh5dump.sh.in +++ b/tools/h5dump/testh5dump.sh.in @@ -212,6 +212,8 @@ $SRC_H5DUMP_TESTFILES/tbinregR.ddl $SRC_H5DUMP_TESTFILES/tbigdims.ddl $SRC_H5DUMP_TESTFILES/tboot1.ddl $SRC_H5DUMP_TESTFILES/tboot2.ddl +$SRC_H5DUMP_TESTFILES/tboot2A.ddl +$SRC_H5DUMP_TESTFILES/tboot2B.ddl $SRC_H5DUMP_TESTFILES/tchar1.ddl $SRC_H5DUMP_TESTFILES/tchunked.ddl $SRC_H5DUMP_TESTFILES/tcmpdattrintsize.ddl @@ -1040,6 +1042,8 @@ TOOLTEST charsets.ddl --enable-error-stack charsets.h5 # tests for super block TOOLTEST tboot1.ddl --enable-error-stack -H -B -d dset tfcontents1.h5 TOOLTEST tboot2.ddl --enable-error-stack -B tfcontents2.h5 +TOOLTEST tboot2A.ddl --enable-error-stack --boot-block tfcontents2.h5 +TOOLTEST tboot2B.ddl --enable-error-stack --superblock tfcontents2.h5 TOOLTEST file_space.ddl --enable-error-stack -B file_space.h5 # test -p with a non existing dataset |