From e86655bbf4e707ba93406022350f15688f85c0d7 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 22 Aug 2013 14:57:31 -0500
Subject: [svn-r24057] Add --superblock long name to parser and add tests for
 both --boot-block and --superblock.

Tested: local linux
---
 MANIFEST                      | 133 +++++++++++++++++++++---------------------
 tools/h5dump/CMakeTests.cmake |   8 +++
 tools/h5dump/h5dump.c         |   1 +
 tools/h5dump/testh5dump.sh.in |   4 ++
 tools/testfiles/tboot2A.ddl   |  20 +++++++
 tools/testfiles/tboot2B.ddl   |  20 +++++++
 6 files changed, 121 insertions(+), 65 deletions(-)
 create mode 100644 tools/testfiles/tboot2A.ddl
 create mode 100644 tools/testfiles/tboot2B.ddl

diff --git a/MANIFEST b/MANIFEST
index a747476..bd382f9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1318,7 +1318,6 @@
 ./tools/misc/testfiles/h5mkgrp_version.txt.in
 ./tools/misc/h5perf_gentest.c
 
-
 # h5stat sources
 ./tools/h5stat/Makefile.am
 ./tools/h5stat/Makefile.in
@@ -1384,14 +1383,18 @@
 ./tools/testfiles/family_file00015.h5
 ./tools/testfiles/family_file00016.h5
 ./tools/testfiles/family_file00017.h5
-./tools/testfiles/filter_fail.h5
-./tools/testfiles/filter_fail.ddl
-./tools/testfiles/packedbits.ddl
 ./tools/testfiles/file_space.h5
 ./tools/testfiles/file_space.ddl
+./tools/testfiles/filter_fail.h5
+./tools/testfiles/filter_fail.ddl
 ./tools/testfiles/h5dump-help.txt
+./tools/testfiles/packedbits.ddl
+./tools/testfiles/taindices.h5
 ./tools/testfiles/tall-1.ddl
 ./tools/testfiles/tall-2.ddl
+./tools/testfiles/tall-2A.ddl
+./tools/testfiles/tall-2A0.ddl
+./tools/testfiles/tall-2B.ddl
 ./tools/testfiles/tall-3.ddl
 ./tools/testfiles/tall-4s.ddl
 ./tools/testfiles/tall-5s.ddl
@@ -1400,6 +1403,7 @@
 ./tools/testfiles/tall-7.ddl
 ./tools/testfiles/tall-7N.ddl
 ./tools/testfiles/tall.h5
+./tools/testfiles/tallfilters.ddl
 ./tools/testfiles/tarray1.ddl
 ./tools/testfiles/tarray1.h5
 ./tools/testfiles/tarray1_big.ddl
@@ -1418,22 +1422,40 @@
 ./tools/testfiles/tarray7.h5
 ./tools/testfiles/tarray8.ddl
 ./tools/testfiles/tarray8.h5
+./tools/testfiles/tattr.h5
 ./tools/testfiles/tattr-1.ddl
 ./tools/testfiles/tattr-2.ddl
 ./tools/testfiles/tattr-3.ddl
 ./tools/testfiles/tattr-4_be.ddl
-./tools/testfiles/tattr.h5
+./tools/testfiles/tattr2.h5
+./tools/testfiles/tattr4_be.h5
+./tools/testfiles/tattrcontents1.ddl
+./tools/testfiles/tattrcontents2.ddl
 ./tools/testfiles/tattrintsize.ddl
 ./tools/testfiles/tattrintsize.h5
-./tools/testfiles/tattr4_be.h5
 ./tools/testfiles/tattrreg.h5
 ./tools/testfiles/tattrreg.ddl 
 ./tools/testfiles/tattrregR.ddl 
+./tools/testfiles/tbigdims.ddl
+./tools/testfiles/tbigdims.h5
+./tools/testfiles/tbinary.h5
+./tools/testfiles/tbin1.ddl
+./tools/testfiles/tbin2.ddl
+./tools/testfiles/tbin3.ddl
+./tools/testfiles/tbin4.ddl
 ./tools/testfiles/tbinregR.exp
 ./tools/testfiles/tbinregR.ddl
 ./tools/testfiles/tbitfields.h5
+./tools/testfiles/tboot1.ddl
+./tools/testfiles/tboot2.ddl
+./tools/testfiles/tboot2A.ddl
+./tools/testfiles/tboot2B.ddl
 ./tools/testfiles/tchar.h5
 ./tools/testfiles/tchar1.ddl
+./tools/testfiles/tchunked.ddl
+./tools/testfiles/tcompact.ddl
+./tools/testfiles/tcontents.ddl
+./tools/testfiles/tcontiguos.ddl
 ./tools/testfiles/tcmpdattrintsize.ddl
 ./tools/testfiles/tcmpdintsize.ddl
 ./tools/testfiles/tcmpdattrintsize.h5
@@ -1448,6 +1470,7 @@
 ./tools/testfiles/tdatareg.h5
 ./tools/testfiles/tdatareg.ddl 
 ./tools/testfiles/tdataregR.ddl 
+./tools/testfiles/tdeflate.ddl
 ./tools/testfiles/tdset-1.ddl
 ./tools/testfiles/tdset-2.ddl
 ./tools/testfiles/tdset-3s.ddl
@@ -1460,6 +1483,7 @@
 ./tools/testfiles/texceedsubcount.ddl
 ./tools/testfiles/texceedsubstart.ddl
 ./tools/testfiles/texceedsubstride.ddl
+./tools/testfiles/texternal.ddl
 ./tools/testfiles/textlink.h5
 ./tools/testfiles/textlink.h5.xml
 ./tools/testfiles/textlink.ddl
@@ -1468,7 +1492,6 @@
 ./tools/testfiles/textlinksrc.ddl
 ./tools/testfiles/textlinksrc.h5
 ./tools/testfiles/textlinktar.h5
-./tools/testfiles/tsoftlinks.h5
 ./tools/testfiles/tfamily.ddl
 ./tools/testfiles/tfamily00000.h5
 ./tools/testfiles/tfamily00001.h5
@@ -1481,6 +1504,12 @@
 ./tools/testfiles/tfamily00008.h5
 ./tools/testfiles/tfamily00009.h5
 ./tools/testfiles/tfamily00010.h5
+./tools/testfiles/tfcontents1.h5
+./tools/testfiles/tfcontents2.h5
+./tools/testfiles/tfill.ddl
+./tools/testfiles/tfilters.h5
+./tools/testfiles/tfletcher32.ddl
+./tools/testfiles/tfvalues.h5
 ./tools/testfiles/tgroup-1.ddl
 ./tools/testfiles/tgroup-2.ddl
 ./tools/testfiles/tgroup.h5
@@ -1493,8 +1522,17 @@
 ./tools/testfiles/thlink-4.ddl
 ./tools/testfiles/thlink-5.ddl
 ./tools/testfiles/thlink.h5
+./tools/testfiles/thyperslab.ddl
+./tools/testfiles/thyperslab.h5
+./tools/testfiles/tindicesyes.ddl
+./tools/testfiles/tindicesno.ddl
+./tools/testfiles/tindicessub2.ddl
+./tools/testfiles/tindicessub3.ddl
+./tools/testfiles/tindicessub4.ddl
+./tools/testfiles/tindicessub1.ddl
 ./tools/testfiles/tlarge_objname.ddl
 ./tools/testfiles/tlarge_objname.h5
+./tools/testfiles/tldouble.h5
 ./tools/testfiles/tlonglinks.ddl
 ./tools/testfiles/tlonglinks.h5
 ./tools/testfiles/tloop-1.ddl
@@ -1510,8 +1548,6 @@
 ./tools/testfiles/tmulti-s.h5
 ./tools/testfiles/tmultifile.ls
 ./tools/testfiles/tmultifile.ddl
-./tools/testfiles/tqmarkfile.ddl
-./tools/testfiles/tstarfile.ddl
 ./tools/testfiles/tnbit.ddl
 ./tools/testfiles/tnestcomp-1.ddl
 ./tools/testfiles/tnestedcomp.h5
@@ -1529,10 +1565,17 @@
 ./tools/testfiles/tnullspace.ddl
 ./tools/testfiles/tobjref.h5
 ./tools/testfiles/topaque.h5
+./tools/testfiles/tordercontents1.ddl
+./tools/testfiles/tordercontents2.ddl
+./tools/testfiles/torderlinks1.ddl
+./tools/testfiles/torderlinks2.ddl
+./tools/testfiles/tperror.ddl
+./tools/testfiles/tqmarkfile.ddl
 ./tools/testfiles/trawdatafile.ddl
 ./tools/testfiles/trawdatafile.exp
 ./tools/testfiles/trawssetfile.ddl
 ./tools/testfiles/trawssetfile.exp
+./tools/testfiles/treference.ddl
 ./tools/testfiles/tsaf.ddl
 ./tools/testfiles/tsaf.h5
 ./tools/testfiles/tscalarattrintsize.ddl
@@ -1542,19 +1585,32 @@
 ./tools/testfiles/tscalarstring.ddl
 ./tools/testfiles/tscalarstring.h5
 ./tools/testfiles/tscaleoffset.ddl
+./tools/testfiles/tshuffle.ddl
 ./tools/testfiles/tslink-1.ddl
 ./tools/testfiles/tslink-2.ddl
 ./tools/testfiles/tslink-D.ddl
 ./tools/testfiles/tslink.h5
+./tools/testfiles/tsoftlinks.h5
 ./tools/testfiles/tsplit_file-m.h5
 ./tools/testfiles/tsplit_file-r.h5
 ./tools/testfiles/tsplit_file.ddl
-./tools/testfiles/tstr-1.ddl
+./tools/testfiles/tstarfile.ddl
 ./tools/testfiles/tstr.h5
 ./tools/testfiles/tstr2.h5
+./tools/testfiles/tstr3.h5
+./tools/testfiles/tstr-1.ddl
 ./tools/testfiles/tstr-2.ddl
 ./tools/testfiles/tstr2bin2.exp
 ./tools/testfiles/tstr2bin6.exp
+./tools/testfiles/tstring.ddl
+./tools/testfiles/tstring2.ddl
+./tools/testfiles/tstringe.ddl
+./tools/testfiles/tszip.ddl
+./tools/testfiles/tudlink.h5
+./tools/testfiles/tudlink.h5.xml
+./tools/testfiles/tudlink-1.ddl
+./tools/testfiles/tudlink-2.ddl
+./tools/testfiles/tuserfilter.ddl
 ./tools/testfiles/tvldtypes1.ddl
 ./tools/testfiles/tvldtypes1.h5
 ./tools/testfiles/tvldtypes2.ddl
@@ -1567,63 +1623,8 @@
 ./tools/testfiles/tvldtypes5.h5
 ./tools/testfiles/tvlstr.h5
 ./tools/testfiles/tvlstr.ddl
-./tools/testfiles/tudlink.h5
-./tools/testfiles/tudlink.h5.xml
-./tools/testfiles/tudlink-1.ddl
-./tools/testfiles/tudlink-2.ddl
-./tools/testfiles/tattr2.h5
-./tools/testfiles/tall-2A.ddl
-./tools/testfiles/tall-2A0.ddl
-./tools/testfiles/tall-2B.ddl
-./tools/testfiles/tattrcontents1.ddl
-./tools/testfiles/tattrcontents2.ddl
-./tools/testfiles/tcontents.ddl
-./tools/testfiles/tordercontents1.ddl
-./tools/testfiles/tordercontents2.ddl
-./tools/testfiles/torderlinks1.ddl
-./tools/testfiles/torderlinks2.ddl
-./tools/testfiles/tfilters.h5
-./tools/testfiles/tchunked.ddl
-./tools/testfiles/tcompact.ddl
-./tools/testfiles/tcontiguos.ddl
-./tools/testfiles/tdeflate.ddl
-./tools/testfiles/texternal.ddl
-./tools/testfiles/tfletcher32.ddl
-./tools/testfiles/treference.ddl
-./tools/testfiles/tshuffle.ddl
-./tools/testfiles/tstring.ddl
-./tools/testfiles/tszip.ddl
-./tools/testfiles/tuserfilter.ddl
-./tools/testfiles/tallfilters.ddl
-./tools/testfiles/tstringe.ddl
-./tools/testfiles/tindicesyes.ddl
-./tools/testfiles/tindicesno.ddl
-./tools/testfiles/tfcontents1.h5
-./tools/testfiles/tfcontents2.h5
-./tools/testfiles/tboot1.ddl
-./tools/testfiles/tboot2.ddl
-./tools/testfiles/tperror.ddl
-./tools/testfiles/tfill.ddl
-./tools/testfiles/tfvalues.h5
-./tools/testfiles/tstring2.ddl
-./tools/testfiles/tstr3.h5
-./tools/testfiles/taindices.h5
 ./tools/testfiles/tvms.ddl
-./tools/testfiles/tldouble.h5
 ./tools/testfiles/tvms.h5
-./tools/testfiles/tbinary.h5
-./tools/testfiles/tbin1.ddl
-./tools/testfiles/tbin2.ddl
-./tools/testfiles/tbin3.ddl
-./tools/testfiles/tbin4.ddl
-./tools/testfiles/tindicessub2.ddl
-./tools/testfiles/tindicessub3.ddl
-./tools/testfiles/tindicessub4.ddl
-./tools/testfiles/tindicessub1.ddl
-./tools/testfiles/thyperslab.ddl
-./tools/testfiles/tbigdims.ddl
-./tools/testfiles/tbigdims.h5
-./tools/testfiles/thyperslab.h5
 ./tools/testfiles/twidedisplay.ddl
 ./tools/testfiles/twithddl.exp
 ./tools/testfiles/twithddlfile.ddl
@@ -1723,6 +1724,7 @@
 ./tools/testfiles/tpbitsIntOffsetExceeded.ddl
 ./tools/testfiles/tpbitsLongOffsetExceeded.ddl
 ./tools/testfiles/tpbitsOverlapped.ddl
+
 # h5dump h5import validation
 ./tools/testfiles/out3.h5import
 ./tools/testfiles/tordergr.h5
@@ -1738,6 +1740,7 @@
 ./tools/testfiles/torderattr.h5
 ./tools/testfiles/tfpformat.ddl
 ./tools/testfiles/tfpformat.h5
+
 # h5dump h5repack validation
 ./tools/testfiles/h5repack_filters.h5.ddl
 ./tools/testfiles/zerodim.ddl
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
diff --git a/tools/testfiles/tboot2A.ddl b/tools/testfiles/tboot2A.ddl
new file mode 100644
index 0000000..d83b92b
--- /dev/null
+++ b/tools/testfiles/tboot2A.ddl
@@ -0,0 +1,20 @@
+HDF5 "tfcontents2.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 0
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   FILE_SPACE_STRATEGY H5F_FILE_SPACE_ALL
+   FREE_SPACE_THRESHOLD 1
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+}
+}
diff --git a/tools/testfiles/tboot2B.ddl b/tools/testfiles/tboot2B.ddl
new file mode 100644
index 0000000..d83b92b
--- /dev/null
+++ b/tools/testfiles/tboot2B.ddl
@@ -0,0 +1,20 @@
+HDF5 "tfcontents2.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 0
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   FILE_SPACE_STRATEGY H5F_FILE_SPACE_ALL
+   FREE_SPACE_THRESHOLD 1
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+}
+}
-- 
cgit v0.12