[svn-r23190] HDFFV-8285: Add suppress ddl option.

Tested: local linux

11 files changed, 120 insertions, 0 deletions

diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index 74fc104..12629c9 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -46,6 +46,8 @@ usage: h5dump [OPTIONS] files
                           occur.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
+     -O F, --ddl=F        Output ddl text into file F
+                          Use NULL as filename to suppress ddl display
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
diff --git a/tools/testfiles/tnoattrdata.ddl b/tools/testfiles/tnoattrdata.ddl
new file mode 100644
index 0000000..a5d40fe
--- /dev/null
+++ b/tools/testfiles/tnoattrdata.ddl
@@ -0,0 +1,39 @@
+HDF5 "tattr.h5" {
+GROUP "/" {
+   ATTRIBUTE "/attr1" {
+      DATATYPE  H5T_STD_I8BE
+      DATASPACE  SIMPLE { ( 24 ) / ( 24 ) }
+      DATA {
+      }
+   }
+   ATTRIBUTE "attr2" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+      DATA {
+      }
+   }
+   ATTRIBUTE "attr3" {
+      DATATYPE  H5T_IEEE_F64BE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+      DATA {
+      }
+   }
+   ATTRIBUTE "attr4" {
+      DATATYPE  H5T_STD_I32BE
+      DATASPACE  SCALAR
+      DATA {
+      }
+   }
+   ATTRIBUTE "attr5" {
+      DATATYPE  H5T_STRING {
+         STRSIZE 17;
+         STRPAD H5T_STR_NULLTERM;
+         CSET H5T_CSET_ASCII;
+         CTYPE H5T_C_S1;
+      }
+      DATASPACE  SCALAR
+      DATA {
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tnoattrddl.ddl b/tools/testfiles/tnoattrddl.ddl
new file mode 100644
index 0000000..c68877d
--- /dev/null
+++ b/tools/testfiles/tnoattrddl.ddl
@@ -0,0 +1,7 @@
+
+         97, 116, 116, 114, 105, 98, 117, 116, 101, 32, 111, 102, 32, 114, 111,
+         111, 116, 32, 103, 114, 111, 117, 112, 0
+         1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+         0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9
+         100
+         "string attribute"
\ No newline at end of file
diff --git a/tools/testfiles/tnodata.ddl b/tools/testfiles/tnodata.ddl
new file mode 100644
index 0000000..f99d906
--- /dev/null
+++ b/tools/testfiles/tnodata.ddl
@@ -0,0 +1,58 @@
+HDF5 "packedbits.h5" {
+GROUP "/" {
+   DATASET "DS08BITS" {
+      DATATYPE  H5T_STD_I8LE
+      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
+      DATA {
+      }
+   }
+   DATASET "DS16BITS" {
+      DATATYPE  H5T_STD_I16LE
+      DATASPACE  SIMPLE { ( 8, 16 ) / ( 8, 16 ) }
+      DATA {
+      }
+   }
+   DATASET "DS32BITS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 8, 32 ) / ( 8, 32 ) }
+      DATA {
+      }
+   }
+   DATASET "DS64BITS" {
+      DATATYPE  H5T_STD_I64LE
+      DATASPACE  SIMPLE { ( 8, 64 ) / ( 8, 64 ) }
+      DATA {
+      }
+   }
+   DATASET "DU08BITS" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
+      DATA {
+      }
+   }
+   DATASET "DU16BITS" {
+      DATATYPE  H5T_STD_U16LE
+      DATASPACE  SIMPLE { ( 8, 16 ) / ( 8, 16 ) }
+      DATA {
+      }
+   }
+   DATASET "DU32BITS" {
+      DATATYPE  H5T_STD_U32LE
+      DATASPACE  SIMPLE { ( 8, 32 ) / ( 8, 32 ) }
+      DATA {
+      }
+   }
+   DATASET "DU64BITS" {
+      DATATYPE  H5T_STD_U64LE
+      DATASPACE  SIMPLE { ( 8, 64 ) / ( 8, 64 ) }
+      DATA {
+      }
+   }
+   DATASET "DummyDBL" {
+      DATATYPE  H5T_IEEE_F64BE
+      DATASPACE  SIMPLE { ( 8, 8 ) / ( 8, 8 ) }
+      DATA {
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl
index 5e6f580..e8b733c 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/tnofilename-with-packed-bits.ddl
@@ -46,6 +46,8 @@ usage: h5dump [OPTIONS] files
                           occur.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
+     -O F, --ddl=F        Output ddl text into file F
+                          Use NULL as filename to suppress ddl display
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl
index 10b5a23..0af7386 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/tpbitsIncomplete.ddl
@@ -46,6 +46,8 @@ usage: h5dump [OPTIONS] files
                           occur.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
+     -O F, --ddl=F        Output ddl text into file F
+                          Use NULL as filename to suppress ddl display
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl
index 17dd963..bf1ced8 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/tpbitsLengthExceeded.ddl
@@ -46,6 +46,8 @@ usage: h5dump [OPTIONS] files
                           occur.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
+     -O F, --ddl=F        Output ddl text into file F
+                          Use NULL as filename to suppress ddl display
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl
index 6d05b47..4aa79bd 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/tpbitsLengthPositive.ddl
@@ -46,6 +46,8 @@ usage: h5dump [OPTIONS] files
                           occur.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
+     -O F, --ddl=F        Output ddl text into file F
+                          Use NULL as filename to suppress ddl display
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl
index eca1248..89a767c 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/tpbitsMaxExceeded.ddl
@@ -46,6 +46,8 @@ usage: h5dump [OPTIONS] files
                           occur.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
+     -O F, --ddl=F        Output ddl text into file F
+                          Use NULL as filename to suppress ddl display
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl
index b0c655d..2f89be6 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/tpbitsOffsetExceeded.ddl
@@ -46,6 +46,8 @@ usage: h5dump [OPTIONS] files
                           occur.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
+     -O F, --ddl=F        Output ddl text into file F
+                          Use NULL as filename to suppress ddl display
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl
index 213641b..e3bca0c 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/tpbitsOffsetNegative.ddl
@@ -46,6 +46,8 @@ usage: h5dump [OPTIONS] files
                           occur.
      --no-compact-subset  Disable compact form of subsetting and allow the use
                           of "[" in dataset names.
+     -O F, --ddl=F        Output ddl text into file F
+                          Use NULL as filename to suppress ddl display
 
  Subsetting is available by using the following options with a dataset
  attribute. Subsetting is done by selecting a hyperslab from the data.