[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)

2 files changed, 18 insertions, 11 deletions

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