[svn-r8583] Purpose:

added 2 new tests (boot block and file contents)

Description:

Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:

5 files changed, 56 insertions, 0 deletions

diff --git a/MANIFEST b/MANIFEST
index eac6199..de94fe3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1336,6 +1336,9 @@
 ./tools/testfiles/tattr2.h5
 ./tools/testfiles/tattr2.h5
 ./tools/testfiles/tall-2A.ddl
+./tools/testfiles/tboot.ddl
+./tools/testfiles/tcontents.ddl
+./tools/testfiles/tfilters.h5
 
 # Expected output from h5ls tests
 ./tools/testfiles/help-1.ls
diff --git a/tools/h5dump/testh5dump.sh b/tools/h5dump/testh5dump.sh
index 2119101..fc63188 100755
--- a/tools/h5dump/testh5dump.sh
+++ b/tools/h5dump/testh5dump.sh
@@ -196,6 +196,11 @@ TOOLTEST tchar1.ddl -r tchar.h5
 # Missing file name
 TOOLTEST tnofilename.ddl
 
+# test for super block
+TOOLTEST tboot.ddl -H -B -d compact tfilters.h5
+
+# test for file contents
+TOOLTEST tcontents.ddl -n tfilters.h5
 
 
 if test $nerrors -eq 0 ; then
diff --git a/tools/testfiles/tboot.ddl b/tools/testfiles/tboot.ddl
new file mode 100644
index 0000000..3ccba78
--- /dev/null
+++ b/tools/testfiles/tboot.ddl
@@ -0,0 +1,23 @@
+#############################
+Expected output for 'h5dump -H -B -d compact tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 0
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   USERBLOCK_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   FILE_DRIVER H5FD_SEC2
+   ISTORE_K 32
+}
+DATASET "compact" {
+COMMENT "This is a dataset with compact storage"
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
+}
+}
diff --git a/tools/testfiles/tcontents.ddl b/tools/testfiles/tcontents.ddl
new file mode 100644
index 0000000..7dcc1d4
--- /dev/null
+++ b/tools/testfiles/tcontents.ddl
@@ -0,0 +1,25 @@
+#############################
+Expected output for 'h5dump -n tfilters.h5'
+#############################
+HDF5 "tfilters.h5" {
+FILE_CONTENTS {
+ dataset    /all
+ dataset    /bitfield
+ dataset    /char
+ dataset    /compact
+ dataset    /contiguous
+ dataset    /deflate
+ dataset    /enum
+ dataset    /external
+ dataset    /fill early
+ dataset    /fill ifset
+ dataset    /fill never
+ dataset    /fletcher32
+ datatype   /my type
+ dataset    /myfilter
+ datatype   /myvlen
+ dataset    /shuffle
+ dataset    /string
+ dataset    /vlen
+ }
+}
diff --git a/tools/testfiles/tfilters.h5 b/tools/testfiles/tfilters.h5
new file mode 100644
index 0000000..80aff52
--- /dev/null
+++ b/tools/testfiles/tfilters.h5