[svn-r12419] Purpose: Maintenance/new feature

Description: Added new tests for the h5stat tool; added --version flag
             to display library version information and updated expected
             output files.

Solution:

Platforms tested: heping, shanti

Misc. update:

9 files changed, 165 insertions, 0 deletions

diff --git a/tools/misc/testfiles/h5stat_filters-F.ddl b/tools/misc/testfiles/h5stat_filters-F.ddl
new file mode 100644
index 0000000..be95877
--- /dev/null
+++ b/tools/misc/testfiles/h5stat_filters-F.ddl
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5stat -F h5stat_filters.h5'
+#############################
+Filename: h5stat_filters.h5
+Object header size: (total/unused)
+	Groups: 48/8
+	Datasets: 4936/1344
diff --git a/tools/misc/testfiles/h5stat_filters-d.ddl b/tools/misc/testfiles/h5stat_filters-d.ddl
new file mode 100644
index 0000000..ba34ae8
--- /dev/null
+++ b/tools/misc/testfiles/h5stat_filters-d.ddl
@@ -0,0 +1,33 @@
+#############################
+Expected output for 'h5stat -d h5stat_filters.h5'
+#############################
+Filename: h5stat_filters.h5
+Dataset dimension information:
+	Max. rank of datasets: 2
+	Dataset ranks:
+		# of dataset with rank 1: 1
+		# of dataset with rank 2: 14
+1-D Dataset information:
+	Max. dimension size of 1-D datasets: 100
+	Small 1-D datasets:
+		Total small datasets: 0
+	1-D Dataset dimension bins:
+		# of datasets of size 100 - 999: 1
+		Total # of datasets: 1
+Dataset storage information:
+	Total raw data size: 8659
+Dataset layout information:
+	Dataset layout counts[COMPACT]: 1
+	Dataset layout counts[CONTIG]: 2
+	Dataset layout counts[CHUNKED]: 12
+	Number of external files : 2
+Dataset filters information:
+	Number of datasets with 
+	                        NO filter: 7
+	                        GZIP filter: 2
+	                        SHUFFLE filter: 2
+	                        FLETCHER32 filter: 2
+	                        SZIP filter: 2
+	                        NBIT filter: 2
+	                        SCALEOFFSET filter: 1
+	                        USER-DEFINED filter: 1
diff --git a/tools/misc/testfiles/h5stat_filters-dT.ddl b/tools/misc/testfiles/h5stat_filters-dT.ddl
new file mode 100644
index 0000000..5e91577
--- /dev/null
+++ b/tools/misc/testfiles/h5stat_filters-dT.ddl
@@ -0,0 +1,42 @@
+#############################
+Expected output for 'h5stat -dT h5stat_filters.h5'
+#############################
+Filename: h5stat_filters.h5
+Dataset dimension information:
+	Max. rank of datasets: 2
+	Dataset ranks:
+		# of dataset with rank 1: 1
+		# of dataset with rank 2: 14
+1-D Dataset information:
+	Max. dimension size of 1-D datasets: 100
+	Small 1-D datasets:
+		Total small datasets: 0
+	1-D Dataset dimension bins:
+		# of datasets of size 100 - 999: 1
+		Total # of datasets: 1
+Dataset storage information:
+	Total raw data size: 8659
+Dataset layout information:
+	Dataset layout counts[COMPACT]: 1
+	Dataset layout counts[CONTIG]: 2
+	Dataset layout counts[CHUNKED]: 12
+	Number of external files : 2
+Dataset filters information:
+	Number of datasets with 
+	                        NO filter: 7
+	                        GZIP filter: 2
+	                        SHUFFLE filter: 2
+	                        FLETCHER32 filter: 2
+	                        SZIP filter: 2
+	                        NBIT filter: 2
+	                        SCALEOFFSET filter: 1
+	                        USER-DEFINED filter: 1
+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/misc/testfiles/h5stat_filters-f.ddl b/tools/misc/testfiles/h5stat_filters-f.ddl
new file mode 100644
index 0000000..c6aeef0
--- /dev/null
+++ b/tools/misc/testfiles/h5stat_filters-f.ddl
@@ -0,0 +1,13 @@
+#############################
+Expected output for 'h5stat -f h5stat_filters.h5'
+#############################
+Filename: h5stat_filters.h5
+File information
+	# of unique groups: 1
+	# of unique datasets: 15
+	# of unique named dataypes: 1
+	# of unique links: 0
+	# of unique other: 0
+	Max. # of links to object: 1
+	Max. depth of hierarchy: 0
+	Max. # of objects in group: 16
diff --git a/tools/misc/testfiles/h5stat_filters-g.ddl b/tools/misc/testfiles/h5stat_filters-g.ddl
new file mode 100644
index 0000000..d488b8f
--- /dev/null
+++ b/tools/misc/testfiles/h5stat_filters-g.ddl
@@ -0,0 +1,9 @@
+#############################
+Expected output for 'h5stat -g h5stat_filters.h5'
+#############################
+Filename: h5stat_filters.h5
+Small groups:
+	Total # of small groups: 0
+Group bins:
+	# of groups of size 10 - 99: 1
+	Total # of groups: 1
diff --git a/tools/misc/testfiles/h5stat_filters.ddl b/tools/misc/testfiles/h5stat_filters.ddl
new file mode 100644
index 0000000..891a62b
--- /dev/null
+++ b/tools/misc/testfiles/h5stat_filters.ddl
@@ -0,0 +1,59 @@
+#############################
+Expected output for 'h5stat h5stat_filters.h5'
+#############################
+Filename: h5stat_filters.h5
+File information
+	# of unique groups: 1
+	# of unique datasets: 15
+	# of unique named dataypes: 1
+	# of unique links: 0
+	# of unique other: 0
+	Max. # of links to object: 1
+	Max. depth of hierarchy: 0
+	Max. # of objects in group: 16
+Object header size: (total/unused)
+	Groups: 48/8
+	Datasets: 4936/1344
+Small groups:
+	Total # of small groups: 0
+Group bins:
+	# of groups of size 10 - 99: 1
+	Total # of groups: 1
+Dataset dimension information:
+	Max. rank of datasets: 2
+	Dataset ranks:
+		# of dataset with rank 1: 1
+		# of dataset with rank 2: 14
+1-D Dataset information:
+	Max. dimension size of 1-D datasets: 100
+	Small 1-D datasets:
+		Total small datasets: 0
+	1-D Dataset dimension bins:
+		# of datasets of size 100 - 999: 1
+		Total # of datasets: 1
+Dataset storage information:
+	Total raw data size: 8659
+Dataset layout information:
+	Dataset layout counts[COMPACT]: 1
+	Dataset layout counts[CONTIG]: 2
+	Dataset layout counts[CHUNKED]: 12
+	Number of external files : 2
+Dataset filters information:
+	Number of datasets with 
+	                        NO filter: 7
+	                        GZIP filter: 2
+	                        SHUFFLE filter: 2
+	                        FLETCHER32 filter: 2
+	                        SZIP filter: 2
+	                        NBIT filter: 2
+	                        SCALEOFFSET filter: 1
+	                        USER-DEFINED filter: 1
+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/misc/testfiles/h5stat_filters.h5 b/tools/misc/testfiles/h5stat_filters.h5
new file mode 100644
index 0000000..5b5f4bb
--- /dev/null
+++ b/tools/misc/testfiles/h5stat_filters.h5
diff --git a/tools/misc/testfiles/h5stat_help1.ddl b/tools/misc/testfiles/h5stat_help1.ddl
index 05f1926..c4ef2c1 100644
--- a/tools/misc/testfiles/h5stat_help1.ddl
+++ b/tools/misc/testfiles/h5stat_help1.ddl
@@ -12,6 +12,7 @@ Usage: h5stat [OPTIONS] file
 
       OPTIONS
      -h, --help            Print a usage message and exit
+     -V, --version         Print version number and exit
      -f, --file            Print file information
      -F, --filemetadata    Print file metadata
      -g, --group           Print group information
diff --git a/tools/misc/testfiles/h5stat_help2.ddl b/tools/misc/testfiles/h5stat_help2.ddl
index b8eda84..8d9d6d6 100644
--- a/tools/misc/testfiles/h5stat_help2.ddl
+++ b/tools/misc/testfiles/h5stat_help2.ddl
@@ -12,6 +12,7 @@ Usage: h5stat [OPTIONS] file
 
       OPTIONS
      -h, --help            Print a usage message and exit
+     -V, --version         Print version number and exit
      -f, --file            Print file information
      -F, --filemetadata    Print file metadata
      -g, --group           Print group information