[svn-r14390] Maintenance for VMS system before the final release:

	Updated utilities test scripts to make output more legible; fixed some typos.
	Added four new expected output files to avoid false negative reports
	for the h5dump tests (for ones that expect to have error report in them).
        Updated MANIFEST to reflect the changes.
Platforms tested: 
	VMS server (more testing is on the way)

13 files changed, 170 insertions, 112 deletions

diff --git a/vms/tools/h5diff/check_h5diff.com b/vms/tools/h5diff/check_h5diff.com
index b2b5782..a66d1d6 100644
--- a/vms/tools/h5diff/check_h5diff.com
+++ b/vms/tools/h5diff/check_h5diff.com
@@ -18,6 +18,12 @@ $ ! This command file tests h5diff utility. The command file has to
 $ ! run in the [hdf5-top.tools.testfiles] directory.
 $ !
 $ !
+$ type sys$input
+
+===================================
+       Testing h5diff utiltity
+===================================
+
 $ ! Define h5diff symbol
 $ !
 $! set message/notext/nofacility/noidentification/noseverity
@@ -280,8 +286,8 @@ $TOOLTEST: SUBROUTINE
 $
 $ len =  F$LENGTH(P1)
 $ base = F$EXTRACT(0,len-2,P1)
-$ actual = base + "out"
-$ actual_err = base + "err"
+$ actual = base + "h5diffout"
+$ actual_err = base + "h5differr"
 $
 $ begin = "Testing h5diff "
 $ !
@@ -300,7 +306,7 @@ $ if F$SEARCH(actual_err) .NES. ""
 $ then
 $ set message/notext/nofacility/noidentification/noseverity
 $    append 'actual_err' 'actual'
-$ set message/ntext/facility/identification/severity
+$ set message/text/facility/identification/severity
 $ endif
 $ !
 $ ! Compare the results
@@ -334,8 +340,10 @@ $ append 'actual'        h5diff_output.txt
 $ !
 $ ! Delete temporary files
 $ !
-$! del *.out;*
-$! del *.dif;*
+$ if F$SEARCH("*.h5differr;*")   then del *.h5diffterr;*
+$ if F$SEARCH("*.h5diffout;*")   then del *.h5difftout;*
+$ if F$SEARCH("*.dif;*")   then del *.dif;*
+$ del *.dif;*
 $ !
 $ENDSUBROUTINE
 
diff --git a/vms/tools/h5diff/make.com b/vms/tools/h5diff/make.com
index d09c474..9c69c85 100644
--- a/vms/tools/h5diff/make.com
+++ b/vms/tools/h5diff/make.com
@@ -19,27 +19,27 @@ $!
 $! ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
-$ type sys$input
-       Creating h5diff  
 $!
 $ cobj= "h5diff_main, h5diff_common, h5diffgentest"
 
 $!                               
 $ ccc 'cobj 
 $ type sys$input
-       Creating h5diffgentest
+       Creating h5diffgentest ...
 $ link/exe=h5diffgentest.exe -
            h5diffgentest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
-       Created  h5difftest
+       Finished  h5difftest
+
 $
 $ type sys$input
-       Creating h5diff
+       Creating h5diff ...
 $ link/exe=h5diff.exe -
            h5diff_main, h5diff_common, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
-       Created  h5diff
+       Finished  h5diff
+
 $!
 $ exit
diff --git a/vms/tools/h5dump/check_h5dump.com b/vms/tools/h5dump/check_h5dump.com
index 59ded4f..b6268d1 100644
--- a/vms/tools/h5dump/check_h5dump.com
+++ b/vms/tools/h5dump/check_h5dump.com
@@ -16,6 +16,13 @@ $ !
 $ ! This command file tests h5dump utility. The command file has to
 $ ! run in the [hdf5-top.tools.testfiles] directory.
 $ !
+$ type sys$input
+
+===================================
+       Testing h5dump utiltity
+===================================
+
+$
 $ !
 $ ! Define h5dump symbol
 $ !
@@ -40,23 +47,17 @@ $
 $ ! Test for displaying groups
 $ CALL TOOLTEST tgroup-1.ddl "tgroup.h5"
 $ ! Test for displaying the selected groups
-$ type sys$input
-                This test reports false negative; check h5dump_output.txt file
 $ CALL TOOLTEST tgroup-2.ddl "--group=/g2 --group / -g /y tgroup.h5"
 $
 $ ! Test for displaying simple space datasets
 $ CALL TOOLTEST tdset-1.ddl "tdset.h5"
 $ ! Test for displaying selected datasets
-$ type sys$input
-                This test reports false negative; check h5dump_output.txt file
 $ CALL TOOLTEST tdset-2.ddl "-"""H""" -d dset1 -d /dset2 --dataset=dset3 tdset.h5"
 $ ! Test for displaying attributes
 $ CALL TOOLTEST tattr-1.ddl "tattr.h5"
 $ ! Test for displaying the selected attributes of string type and scalar space
 $ CALL TOOLTEST tattr-2.ddl "-a /attr1 --attribute /attr4 --attribute=/attr5 tattr.h5"
 $ ! Test for header and error messages
-$ type sys$input
-                This test reports false negative; check h5dump_output.txt file
 $ CALL TOOLTEST tattr-3.ddl "--header -a /attr2 --attribute=/attr tattr.h5"
 $ ! Test for displaying attributes in shared datatype (also in group and dataset)
 $ CALL TOOLTEST tnamed_dtype_attr.ddl "tnamed_dtype_attr.h5"
@@ -159,8 +160,6 @@ $ CALL TOOLTEST tboot1.ddl "-"""H""" -"""B""" -d dset tfcontents1.h5"
 $ CALL TOOLTEST tboot2.ddl "-"""B""" tfcontents2.h5"
 $
 $ ! Test -p with a non existing dataset
-$ type sys$input
-                This test reports false negative; check h5dump_output.txt file
 $ CALL TOOLTEST tperror.ddl "-p -d bogus tfcontents1.h5"
 $
 $ ! Test for file contents
@@ -191,58 +190,6 @@ $
 $ ! Array indices print/not print
 $ CALL TOOLTEST tindicesyes.ddl "taindices.h5"
 $ CALL TOOLTEST tindicesno.ddl "-y taindices.h5"
-$
-$
-$ ! tests for filters
-$ ! SZIP
-$ !option="-H -p -d szip tfilters.h5"
-$ !if test $USE_FILTER_SZIP != "yes"; then
-$  !SKIP $option
-$ !else
-$  !CALL TOOLTEST tszip.ddl $option
-$ !fi
-$ !# deflate
-$ !option="-H -p -d deflate tfilters.h5"
-$ !if test $USE_FILTER_DEFLATE != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tdeflate.ddl $option
-$ !fi
-$ !# shuffle
-$ !option="-H -p -d shuffle tfilters.h5"
-$ !if test $USE_FILTER_SHUFFLE != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tshuffle.ddl $option
-$ !fi
-$ !# fletcher32
-$ !option="-H -p -d fletcher32  tfilters.h5"
-$ !if test $USE_FILTER_FLETCHER32 != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tfletcher32.ddl $option
-$ !fi
-$ !# nbit
-$ !option="-H -p -d nbit  tfilters.h5"
-$ !if test $USE_FILTER_NBIT != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tnbit.ddl $option
-$ !fi
-$ !# scaleoffset
-$ !option="-H -p -d scaleoffset  tfilters.h5"
-$ !if test $USE_FILTER_SCALEOFFSET != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tscaleoffset.ddl $option
-$ !fi
-$ !# all
-$ !option="-H -p -d all  tfilters.h5"
-$ !if test $USE_FILTER_FLETCHER32 != "yes" -o  $USE_FILTER_SZIP != "yes" -o  $USE_FILTER_DEFLATE != "yes" -o  $USE_FILTER_SHUFFLE != "yes" -o $USE_FILTER_NBIT != "yes" -o  $USE_FILTER_SCALEOFFSET != "yes"; then
-$ ! SKIP $option
-$ !else
-$ ! CALL  TOOLTEST tallfilters.ddl $option
-$ !fi
 $ ! User defined
 $ CALL TOOLTEST tuserfilter.ddl "-"""H"""  -p -d myfilter  tfilters.h5"
 $    
@@ -283,8 +230,8 @@ $TOOLTEST: SUBROUTINE
 $
 $ len =  F$LENGTH(P1)
 $ base = F$EXTRACT(0,len-3,P1)
-$ actual = base + "out"
-$ actual_err = base + "err"
+$ actual = base + "h5dumpout"
+$ actual_err = base + "h5dumperr"
 $
 $ begin = "Testing h5dump "
 $ !
@@ -303,7 +250,7 @@ $ if F$SEARCH(actual_err) .NES. ""
 $ then
 $ set message/notext/nofacility/noidentification/noseverity
 $    append 'actual_err' 'actual'
-$ set message/ntext/facility/identification/severity
+$ set message/text/facility/identification/severity
 $ endif
 $ !
 $ ! Compare the results
@@ -337,8 +284,9 @@ $ append 'actual'        h5dump_output.txt
 $ !
 $ ! Delete temporary files
 $ !
-$ del *.out;*
-$ del *.dif;*
+$ if F$SEARCH("*.h5dumpout;*")   then del *.h5dumpout;*
+$ if F$SEARCH("*.h5dumperr;*")   then del *.h5dumperr;*
+$ if F$SEARCH("*.dif;*")   then del *.dif;*
 $ !
 $ENDSUBROUTINE
 $
@@ -346,8 +294,8 @@ $TOOLTEST1: SUBROUTINE
 $
 $ len =  F$LENGTH(P1)
 $ base = F$EXTRACT(0,len-3,P1)
-$ actual = base + "out"
-$ actual_err = base + "err"
+$ actual = base + "h5dumpout"
+$ actual_err = base + "h5dumperr"
 $
 $ begin = "Testing h5dump "
 $ !
@@ -363,7 +311,7 @@ $ if F$SEARCH(actual_err) .NES. ""
 $ then
 $ set message/notext/nofacility/noidentification/noseverity
 $    append 'actual_err' 'actual'
-$ set message/ntext/facility/identification/severity
+$ set message/text/facility/identification/severity
 $ endif
 $ !
 $ ! Compare the results
@@ -397,8 +345,9 @@ $ append 'actual'        h5dump_output.txt
 $ !
 $ ! Delete temporary files
 $ !
-$ del *.out;*
-$ del *.dif;*
+$ if F$SEARCH("*.h5dumpout;*")   then del *.h5dumpout;*
+$ if F$SEARCH("*.h5dumperr;*")   then del *.h5dumperr;*
+$ if F$SEARCH("*.dif;*")   then del *.dif;*
 $ !
 $ENDSUBROUTINE
 
diff --git a/vms/tools/h5dump/make.com b/vms/tools/h5dump/make.com
index 774902c..96ab968 100644
--- a/vms/tools/h5dump/make.com
+++ b/vms/tools/h5dump/make.com
@@ -26,17 +26,18 @@ $ cobj= "h5dump.c, h5dumpgentest.c "
 $                               
 $ ccc 'cobj 
 $ type sys$input
-       Creating h5dumpgentest
+       Creating h5dumpgentest ...
 $ link     h5dumpgentest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
- 	Created  h5dumpgentest
+ 	Finished  h5dumpgentest
+
 $
 $ type sys$input
-       Creating h5dump
+       Creating h5dump ...
 $ link     h5dump, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
-	Created  h5dump
+	Finished  h5dump
 $!
 $ exit
diff --git a/vms/tools/h5import/check_h5import.com b/vms/tools/h5import/check_h5import.com
index 152d3f1..178df88 100644
--- a/vms/tools/h5import/check_h5import.com
+++ b/vms/tools/h5import/check_h5import.com
@@ -17,6 +17,12 @@ $ ! This command file tests h5import utility. The command file has to
 $ ! run in the [hdf5-top.tools.h5import.testfiles] directory.
 $ !
 $ !
+$ type sys$input
+
+===================================
+       Testing h5import utiltity
+===================================
+
 $ ! Define symbols
 $ !
 $ current_dir = F$DIRECTRY()
@@ -98,10 +104,10 @@ $
 $ len =  F$LENGTH(P2)
 $ base = F$EXTRACT(0,len-3,P2)
 $ actual = base + "out.h5"
-$ actual_dump = base + "out.txt"
-$ actual_dump_err = base + "out.err"
-$ expected_dump = base + ".txt"
-$ expected_dump_err = base + ".err"
+$ actual_dump = base + "out.h5importtxt"
+$ actual_dump_err = base + "out.h5importerr"
+$ expected_dump = base + ".h5importtxt"
+$ expected_dump_err = base + ".h5importerr"
 $
 $ begin = "Testing"
 $ !
@@ -188,7 +194,8 @@ $ !
 $ ! Delete temporary files
 $ if F$SEARCH("*out.h5;*") then del *out.h5;*
 $ if F$SEARCH("*.dif;*")   then del *.dif;*
-$ if F$SEARCH("*.err;*")   then del *.err;*
+$ if F$SEARCH("*.h5importerr;*")   then del *.h5importerr;*
+$ if F$SEARCH("*.h5importtxt;*")   then del *.h5importtxt;*
 $ if F$SEARCH("b*.;*")     then del b*.;*
 $ if F$SEARCH("txti*.;*")    then del txti*.;*
 $ if F$SEARCH("txtu*.;*")    then del txtu*.;*
diff --git a/vms/tools/h5import/make.com b/vms/tools/h5import/make.com
index 10a03c1..347c87c 100644
--- a/vms/tools/h5import/make.com
+++ b/vms/tools/h5import/make.com
@@ -20,25 +20,25 @@ $! ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib])
 $ type sys$input
-	Creating  h5import
+       Creating  h5import ...
 $!
 $ cobj= "h5import, h5importtest "
 
 $!                               
 $ ccc 'cobj 
 $
-$ type sys$input
-       Creating h5import
 $ link     h5import,-
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
-	Created  h5import
+       Finished  h5import
+
 $!
 $ type sys$input
-       Creating h5importtest
+       Creating h5importtest ...
 $ link     h5importtest, -
            [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $ type sys$input
-	Created  h5importtest
+       Finished  h5importtest
+
 $!
 $ exit
diff --git a/vms/tools/h5ls/check_h5ls.com b/vms/tools/h5ls/check_h5ls.com
index f9865a9..daa601d 100644
--- a/vms/tools/h5ls/check_h5ls.com
+++ b/vms/tools/h5ls/check_h5ls.com
@@ -97,8 +97,8 @@ $TOOLTEST: SUBROUTINE
 $
 $ len =  F$LENGTH(P1)
 $ base = F$EXTRACT(0,len-2,P1)
-$ actual = base + "out"
-$ actual_err = base + "err"
+$ actual = base + "h5lsout"
+$ actual_err = base + "h5lserr"
 $
 $ begin = "Testing h5ls "
 $ !
@@ -117,7 +117,7 @@ $ if F$SEARCH(actual_err) .NES. ""
 $ then
 $ set message/notext/nofacility/noidentification/noseverity
 $    append 'actual_err' 'actual'
-$ set message/ntext/facility/identification/severity
+$ set message/text/facility/identification/severity
 $ endif
 $ !
 $ ! Compare the results
@@ -150,8 +150,9 @@ $ append h5ls_temp.dif h5ls.log
 $ !
 $ ! Delete temporary files
 $ !
-$! del *.out;*
-$! del *.dif;*
+$ if F$SEARCH("*.h5lserr;*")   then del *.h5lserr;*
+$ if F$SEARCH("*.h5lsout;*")   then del *.h5lsout;*
+$ if F$SEARCH("*.dif;*")   then del *.dif;*
 $ !
 $ENDSUBROUTINE
 
diff --git a/vms/tools/h5repack/check_h5repack.com b/vms/tools/h5repack/check_h5repack.com
index f5eadb4..bacf767 100644
--- a/vms/tools/h5repack/check_h5repack.com
+++ b/vms/tools/h5repack/check_h5repack.com
@@ -18,6 +18,12 @@ $ ! This command file tests h5repack utility. The command file has to
 $ ! run in the [hdf5-top.tools.testfiles] directory.
 $ !
 $ !
+$ type sys$input
+
+===================================
+       Testing h5repack utiltity
+===================================
+
 $ ! Define h5repack and h5diff symbols
 $ !
 $! set message/notext/nofacility/noidentification/noseverity
@@ -137,16 +143,17 @@ $ CALL TOOLTEST "-l dset_chunk:"""CONTI"""" h5repack_layout.h5
 $ CALL TOOLTEST "-l dset_chunk:"""CHUNK"""=18x13" h5repack_layout.h5
 $!
 $!
-$ del *_out.h5;*
-$ del *.out;*
-$! del *.err;*
+$ if F$SEARCH("*.h5repackerr;*")   then del *.h5repackerr;*
+$ if F$SEARCH("*.h5repackout;*")   then del *.h5repackout;*
+$ if F$SEARCH("*_out.h5;*")   then del *_out.h5;*
+$!
 $TOOLTEST: SUBROUTINE
 
 $ len =  F$LENGTH(P2)
 $ base = F$EXTRACT(0,len-3,P2)
 $ output_file = base + "_out.h5"
-$ output_err = base + ".err"
-$ output_out = base + ".out"
+$ output_err = base + ".h5repackerr"
+$ output_out = base + ".h5repackout"
 $
 $ begin = "Testing h5repack"
 $ !
diff --git a/vms/tools/h5repack/make.com b/vms/tools/h5repack/make.com
index 15ff275..f9a42c4 100644
--- a/vms/tools/h5repack/make.com
+++ b/vms/tools/h5repack/make.com
@@ -20,7 +20,7 @@ $! ccopt = "/float=ieee_float"
 $
 $ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test])
 $ type sys$input
-	Creating h5repack
+       Creating h5repack ...
 $!
 $ cobj= " h5repack_main, h5repack, h5repack_copy, h5repack_refs," +-
         "h5repack_filters, h5repack_opttable, h5repack_parse, " +-
@@ -28,8 +28,6 @@ $ cobj= " h5repack_main, h5repack, h5repack_copy, h5repack_refs," +-
 
 $!                               
 $ ccc 'cobj 
-$ type sys$input
-       Creating h5repack
 $ link/exe=h5repack.exe -
            h5repack_main, h5repack, h5repack_copy, h5repack_refs, h5repack_filters, -
            h5repack_opttable, h5repack_parse, -
@@ -37,10 +35,11 @@ $ link/exe=h5repack.exe -
            [-.lib]libh5tools.olb/lib, -
            [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib 
 $ type sys$input
-	Created  h5repack
+       Finished  h5repack
+
 $
 $ type sys$input
-       Creating h5repacktst
+       Creating h5repacktst ...
 $ link/exe=h5repacktst.exe -
            h5repacktst,  -
            h5repack, h5repack_copy, h5repack_refs, h5repack_filters, -
@@ -50,6 +49,6 @@ $ link/exe=h5repacktst.exe -
            [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib
 $
 $ type sys$input
-	Created  h5repacktst
+       Finished  h5repacktst
 $!
 $ exit
diff --git a/vms/tools/testfiles/tattr-3.ddl b/vms/tools/testfiles/tattr-3.ddl
new file mode 100644
index 0000000..8907843
--- /dev/null
+++ b/vms/tools/testfiles/tattr-3.ddl
@@ -0,0 +1,13 @@
+
+#############################
+Expected output for 'h5dump --header -a /attr2 --attribute=/attr tattr.h5'
+#############################
+HDF5 "tattr.h5" {
+ATTRIBUTE "/attr2" {
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+}
+ATTRIBUTE "/attr" {
+}
+}
+h5dump error: unable to open attribute "/"
diff --git a/vms/tools/testfiles/tdset-2.ddl b/vms/tools/testfiles/tdset-2.ddl
new file mode 100644
index 0000000..e6439ae
--- /dev/null
+++ b/vms/tools/testfiles/tdset-2.ddl
@@ -0,0 +1,17 @@
+
+#############################
+Expected output for 'h5dump -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5'
+#############################
+HDF5 "tdset.h5" {
+DATASET "dset1" {
+   DATATYPE  H5T_STD_I32BE
+   DATASPACE  SIMPLE { ( 10, 20 ) / ( 10, 20 ) }
+}
+DATASET "/dset2" {
+   DATATYPE  H5T_IEEE_F64BE
+   DATASPACE  SIMPLE { ( 30, 20 ) / ( 30, 20 ) }
+}
+DATASET "dset3" {
+}
+}
+h5dump error: unable to open dataset "dset3"
diff --git a/vms/tools/testfiles/tgroup-2.ddl b/vms/tools/testfiles/tgroup-2.ddl
new file mode 100644
index 0000000..120ef2d
--- /dev/null
+++ b/vms/tools/testfiles/tgroup-2.ddl
@@ -0,0 +1,47 @@
+
+#############################
+Expected output for 'h5dump --group=/g2 --group / -g /y tgroup.h5'
+#############################
+HDF5 "tgroup.h5" {
+GROUP "/g2" {
+   GROUP "g2.1" {
+      GROUP "g2.1.1" {
+      }
+      GROUP "g2.1.2" {
+      }
+      GROUP "g2.1.3" {
+      }
+   }
+}
+GROUP "/" {
+   GROUP "g1" {
+      GROUP "g1.1" {
+      }
+      GROUP "g1.2" {
+      }
+   }
+   GROUP "g2" {
+      GROUP "g2.1" {
+         GROUP "g2.1.1" {
+         }
+         GROUP "g2.1.2" {
+         }
+         GROUP "g2.1.3" {
+         }
+      }
+   }
+   GROUP "g3" {
+      GROUP "g3.1" {
+      }
+      GROUP "g3.2" {
+      }
+      GROUP "g3.3" {
+      }
+      GROUP "g3.4" {
+      }
+   }
+}
+GROUP "/y" {
+}
+}
+h5dump error: unable to open group "/y"
diff --git a/vms/tools/testfiles/tperror.ddl b/vms/tools/testfiles/tperror.ddl
new file mode 100644
index 0000000..7275907
--- /dev/null
+++ b/vms/tools/testfiles/tperror.ddl
@@ -0,0 +1,9 @@
+
+#############################
+Expected output for 'h5dump -p -d bogus tfcontents1.h5'
+#############################
+HDF5 "tfcontents1.h5" {
+DATASET "bogus" {
+}
+}
+h5dump error: unable to open dataset "bogus"