[svn-r18240] Changes to h5stat in response to bug 1778:

1. Gather attribute information for named datatype
2. Revert names of long options back to original
3. Add new tests & *ddl for testing -G, -D, -T, -A options

h5committested.

6 files changed, 51 insertions, 12 deletions

diff --git a/tools/h5stat/testfiles/h5stat_filters-D.ddl b/tools/h5stat/testfiles/h5stat_filters-D.ddl
new file mode 100644
index 0000000..decfb81
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_filters-D.ddl
@@ -0,0 +1,8 @@
+#############################
+Expected output for 'h5stat -D h5stat_filters.h5'
+#############################
+Filename: h5stat_filters.h5
+File space information for datasets' metadata (in bytes):
+	Object headers (total/unused): 4136/1344
+	Index for Chunked datasets: 31392
+	Heap: 72
diff --git a/tools/h5stat/testfiles/h5stat_filters-T.ddl b/tools/h5stat/testfiles/h5stat_filters-T.ddl
new file mode 100644
index 0000000..189eaa6
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_filters-T.ddl
@@ -0,0 +1,13 @@
+#############################
+Expected output for 'h5stat -T h5stat_filters.h5'
+#############################
+Filename: h5stat_filters.h5
+Dataset datatype information:
+	# of unique datatypes used by datasets: 2
+	Dataset datatype #0:
+		Count (total/named) = (14/0)
+		Size (desc./elmt) = (14/4)
+	Dataset datatype #1:
+		Count (total/named) = (1/0)
+		Size (desc./elmt) = (14/4)
+	Total dataset datatype count: 15
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
index e70fef1..5665b35 100644
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/h5stat/testfiles/h5stat_help1.ddl
@@ -5,14 +5,14 @@ Usage: h5stat [OPTIONS] file
 
       OPTIONS
      -h, --help            Print a usage message and exit
-     -v, --version         Print version number and exit
+     -V, --version         Print version number and exit
      -f, --file            Print file information
-     -F, --FILEmetadata    Print file space information for file's metadata
+     -F, --filemetadata    Print file space information for file's metadata
      -g, --group           Print group information
-     -G, --GROUPmetadata   Print file space information for groups' metadata
+     -G, --groupmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
-     -D, --DSETmetadata    Print file space information for datasets' metadata
-     -T, --DSETtypeinfo    Print datasets' datatype information
-     -a, --attribute       Print attribute information
+     -D, --dsetmetadata    Print file space information for datasets' metadata
+     -T, --dtypemetadata   Print datasets' datatype information
+     -A, --attribute       Print attribute information
      -s, --freespace       Print free space information
      -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl
index fbfdd14..3fb303a 100644
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/h5stat/testfiles/h5stat_help2.ddl
@@ -5,14 +5,14 @@ Usage: h5stat [OPTIONS] file
 
       OPTIONS
      -h, --help            Print a usage message and exit
-     -v, --version         Print version number and exit
+     -V, --version         Print version number and exit
      -f, --file            Print file information
-     -F, --FILEmetadata    Print file space information for file's metadata
+     -F, --filemetadata    Print file space information for file's metadata
      -g, --group           Print group information
-     -G, --GROUPmetadata   Print file space information for groups' metadata
+     -G, --groupmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
-     -D, --DSETmetadata    Print file space information for datasets' metadata
-     -T, --DSETtypeinfo    Print datasets' datatype information
-     -a, --attribute       Print attribute information
+     -D, --dsetmetadata    Print file space information for datasets' metadata
+     -T, --dtypemetadata   Print datasets' datatype information
+     -A, --attribute       Print attribute information
      -s, --freespace       Print free space information
      -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_newgrat-A.ddl b/tools/h5stat/testfiles/h5stat_newgrat-A.ddl
new file mode 100644
index 0000000..70f9a82
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_newgrat-A.ddl
@@ -0,0 +1,10 @@
+#############################
+Expected output for 'h5stat -A h5stat_newgrat.h5'
+#############################
+Filename: h5stat_newgrat.h5
+Small # of attributes:
+	Total # of objects with small # of attributes: 0
+Attribute bins:
+	# of objects with 100 - 999 attributes: 1
+	Total # of objects with attributes: 1
+	Max. # of attributes to objects: 100
diff --git a/tools/h5stat/testfiles/h5stat_newgrat-G.ddl b/tools/h5stat/testfiles/h5stat_newgrat-G.ddl
new file mode 100644
index 0000000..ecebdef
--- /dev/null
+++ b/tools/h5stat/testfiles/h5stat_newgrat-G.ddl
@@ -0,0 +1,8 @@
+#############################
+Expected output for 'h5stat -G h5stat_newgrat.h5'
+#############################
+Filename: h5stat_newgrat.h5
+File space information for groups' metadata (in bytes):
+	Object headers (total/unused): 5145147/3220092
+	B-tree/List: 470054
+	Heap: 739045