[svn-r16456] Maintenance: Brought h5repack and h5diff test scripts up-to-date.

             Modified build script to reflect the change.

Platforms tested: tested tools scripts on the VMS server; build script will
                  be tested tonight.

3 files changed, 14 insertions, 18 deletions

diff --git a/vms/build.com b/vms/build.com
index eb621de..ee13379 100644
--- a/vms/build.com
+++ b/vms/build.com
@@ -25,6 +25,8 @@ $ hdf5ctest   = tmp + ".TEST]"
 $ hdf5f90test = tmp + ".FORTRAN.TEST]"
 $ hdf5cxxtest = tmp  + ".C__.TEST]"
 $ hdf5toolstest = tmp  + ".TOOLS.TESTFILES]"
+$ hdf5toolstest_h5diff = tmp  + ".TOOLS.H5DIFF.TESTFILES]"
+$ hdf5toolstest_h5repack = tmp  + ".TOOLS.H5REPACK.TESTFILES]"
 $ h5importtest  = tmp  + ".TOOLS.H5IMPORT.TESTFILES]"
 $ set def 'hdf5vms'
 $@make
@@ -37,11 +39,13 @@ $@check
 $ set def 'hdf5toolstest'
 $ copy [-.h5dump]check_h5dump.com     check_h5dump.com 
 $ copy [-.h5ls]check_h5ls.com         check_h5ls.com
-$ copy [-.h5diff]check_h5diff.com     check_h5diff.com
-$ copy [-.h5repack]check_h5repack.com check_h5repack.com
 $@check_h5dump.com
 $@check_h5ls.com
+$ set def 'hdf5toolstest_h5diff'
+$ copy [-]check_h5diff.com     check_h5diff.com
 $@check_h5diff.com
+$ set def 'hdf5toolstest_h5repack'
+$ copy [-]check_h5repack.com check_h5repack.com
 $@check_h5repack.com
 $!
 $ set def 'h5importtest'
diff --git a/vms/tools/h5diff/check_h5diff.com b/vms/tools/h5diff/check_h5diff.com
index 9d16b12..0773c16 100644
--- a/vms/tools/h5diff/check_h5diff.com
+++ b/vms/tools/h5diff/check_h5diff.com
@@ -15,7 +15,7 @@ $!#
 $!
 $ !
 $ ! This command file tests h5diff utility. The command file has to
-$ ! run in the [hdf5-top.tools.testfiles] directory.
+$ ! run in the [hdf5-top.tools.h5diff.testfiles] directory.
 $ !
 $ !
 $ type sys$input
@@ -29,8 +29,8 @@ $ !
 $! set message/notext/nofacility/noidentification/noseverity
 $ current_dir = F$DIRECTRY()
 $ len = F$LENGTH(current_dir)
-$ temp = F$EXTRACT(0, len-10, current_dir)
-$ h5diff_dir = temp + "H5DIFF]"
+$ temp = F$EXTRACT(0, len-11, current_dir)
+$ h5diff_dir = temp + "]"
 $ h5diff :== $sys$disk:'h5diff_dir'h5diff.exe
 $ !
 
@@ -152,8 +152,6 @@ $!# ############################################################################
 $!# # -d 
 $!# ##############################################################################
 $!
-$!# 6.2: no value
-$ CALL TOOLTEST h5diff_602.txt "-d h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.3: negative value
 $ CALL TOOLTEST h5diff_603.txt "-d -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
@@ -185,8 +183,6 @@ $!# # -p
 $!# ##############################################################################
 $!
 $!
-$!# 6.11: no value
-$ CALL TOOLTEST h5diff_611.txt "-r -p h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.12: negative value
 $ CALL TOOLTEST h5diff_612.txt "-p -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
@@ -219,8 +215,6 @@ $!# # -n
 $!# ##############################################################################
 $!
 $!
-$!# 6.20: no value
-$ CALL TOOLTEST h5diff_620.txt "-n h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
 $!
 $!# 6.21: negative value
 $ CALL TOOLTEST h5diff_621.txt "-n -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4"
@@ -290,9 +284,6 @@ $ ! Run the test and save output in the 'actual' file
 $ !
 $ define/nolog sys$output 'actual'
 $ define/nolog sys$error  'actual_err'
-$ write  sys$output "#############################"
-$ write  sys$output "Expected output for 'h5diff ''P2''"
-$ write  sys$output "#############################"
 $ ON ERROR THEN CONTINUE
 $ h5diff 'P2
 $ deassign sys$output
diff --git a/vms/tools/h5repack/check_h5repack.com b/vms/tools/h5repack/check_h5repack.com
index 1dcbc78..207951e 100644
--- a/vms/tools/h5repack/check_h5repack.com
+++ b/vms/tools/h5repack/check_h5repack.com
@@ -15,7 +15,7 @@ $!#
 $!
 $ !
 $ ! This command file tests h5repack utility. The command file has to
-$ ! run in the [hdf5-top.tools.testfiles] directory.
+$ ! run in the [hdf5-top.tools.h5repack.testfiles] directory.
 $ !
 $ !
 $ type sys$input
@@ -29,10 +29,11 @@ $ !
 $! set message/notext/nofacility/noidentification/noseverity
 $ current_dir = F$DIRECTRY()
 $ len = F$LENGTH(current_dir)
-$ temp = F$EXTRACT(0, len-10, current_dir)
-$ h5diff_dir = temp + "H5DIFF]"
+$ temp = F$EXTRACT(0, len-11, current_dir)
+$ temp1 = F$EXTRACT(0, len-19, current_dir)
+$ h5diff_dir = temp1 + "H5DIFF]"
 $ h5diff :== $sys$disk:'h5diff_dir'h5diff.exe
-$ h5repack_dir = temp + "H5REPACK]"
+$ h5repack_dir = temp + "]"
 $ h5repack :== $sys$disk:'h5repack_dir'h5repack.exe
 $ !
 $ !