diff options
Diffstat (limited to 'vms/tools')
-rw-r--r-- | vms/tools/h5diff/check_h5diff.com | 25 | ||||
-rw-r--r-- | vms/tools/h5dump/check_h5dump.com | 34 | ||||
-rw-r--r-- | vms/tools/h5import/check_h5import.com | 39 | ||||
-rw-r--r-- | vms/tools/h5repack/check_h5repack.com | 12 |
4 files changed, 61 insertions, 49 deletions
diff --git a/vms/tools/h5diff/check_h5diff.com b/vms/tools/h5diff/check_h5diff.com index a66d1d6..9d16b12 100644 --- a/vms/tools/h5diff/check_h5diff.com +++ b/vms/tools/h5diff/check_h5diff.com @@ -33,16 +33,11 @@ $ temp = F$EXTRACT(0, len-10, current_dir) $ h5diff_dir = temp + "H5DIFF]" $ h5diff :== $sys$disk:'h5diff_dir'h5diff.exe $ ! -$ ! Define output for diff command that compares expected and actual -$ ! outputs of h5diff -$ ! -$ create h5diff.log -$ create h5diff_output.txt + $ ! $ ! h5diff tests $ ! $ - $!# 1.0 $ CALL TOOLTEST h5diff_10.txt "-h" $! @@ -142,7 +137,7 @@ $! $!# 5.7 $ CALL TOOLTEST h5diff_57.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset7a dset7b" $! -$#! 5.8 (region reference) +$!# 5.8 (region reference) $ CALL TOOLTEST h5diff_58.txt "-v h5diff_dset1.h5 h5diff_dset2.h5 refreg" $! $!# ############################################################################## @@ -285,7 +280,7 @@ $! $TOOLTEST: SUBROUTINE $ $ len = F$LENGTH(P1) -$ base = F$EXTRACT(0,len-2,P1) +$ base = F$EXTRACT(0,len-3,P1) $ actual = base + "h5diffout" $ actual_err = base + "h5differr" $ @@ -335,15 +330,17 @@ $ write sys$output line $ ! $ ! Append the result to the log file $ ! -$ append h5diff_temp.dif h5diff.log -$ append 'actual' h5diff_output.txt +$ append/new_version h5diff_temp.dif h5diff.log +$ append/new_version 'actual' h5diff_output.txt $ ! $ ! Delete temporary files $ ! -$ if F$SEARCH("*.h5differr;*") then del *.h5diffterr;* -$ if F$SEARCH("*.h5diffout;*") then del *.h5difftout;* -$ if F$SEARCH("*.dif;*") then del *.dif;* -$ del *.dif;* +$ if F$SEARCH(actual_err) .NES. "" +$ then +$ del *.h5differr;* +$ endif +$ del *.h5diffout;* +$ del h5diff_temp.dif;* $ ! $ENDSUBROUTINE diff --git a/vms/tools/h5dump/check_h5dump.com b/vms/tools/h5dump/check_h5dump.com index b6268d1..2c34731 100644 --- a/vms/tools/h5dump/check_h5dump.com +++ b/vms/tools/h5dump/check_h5dump.com @@ -33,12 +33,6 @@ $ temp = F$EXTRACT(0, len-10, current_dir) $ h5dump_dir = temp + "H5DUMP]" $ h5dump :== $sys$disk:'h5dump_dir'h5dump.exe $ ! -$ ! Define output for diff command that compares expected and actual -$ ! outputs of h5dump -$ ! -$ create h5dump.log -$ create h5dump_output.txt -$ ! $ ! h5dump tests $ ! $ @@ -48,7 +42,6 @@ $ ! Test for displaying groups $ CALL TOOLTEST tgroup-1.ddl "tgroup.h5" $ ! Test for displaying the selected groups $ 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 @@ -237,6 +230,7 @@ $ begin = "Testing h5dump " $ ! $ ! Run the test and save output in the 'actual' file $ ! +$ $ define/nolog sys$output 'actual' $ define/nolog sys$error 'actual_err' $ write sys$output "#############################" @@ -279,14 +273,17 @@ $ write sys$output line $ ! $ ! Append the result to the log file $ ! -$ append h5dump_temp.dif h5dump.log -$ append 'actual' h5dump_output.txt +$ append/new_version h5dump_temp.dif h5dump.log +$ append/new_version 'actual' h5dump_output.txt $ ! $ ! Delete temporary files $ ! -$ if F$SEARCH("*.h5dumpout;*") then del *.h5dumpout;* -$ if F$SEARCH("*.h5dumperr;*") then del *.h5dumperr;* -$ if F$SEARCH("*.dif;*") then del *.dif;* +$ if F$SEARCH(actual_err) .NES. "" +$ then +$ del *.h5dumperr;* +$ endif +$ del *.h5dumpout;* +$ del h5dump_temp.dif;* $ ! $ENDSUBROUTINE $ @@ -340,14 +337,17 @@ $ write sys$output line $ ! $ ! Append the result to the log file $ ! -$ append h5dump_temp.dif h5dump.log -$ append 'actual' h5dump_output.txt +$ append/new_version h5dump_temp.dif h5dump.log +$ append/new_version 'actual' h5dump_output.txt $ ! $ ! Delete temporary files $ ! -$ if F$SEARCH("*.h5dumpout;*") then del *.h5dumpout;* -$ if F$SEARCH("*.h5dumperr;*") then del *.h5dumperr;* -$ if F$SEARCH("*.dif;*") then del *.dif;* +$ if F$SEARCH(actual_err) .NES. "" +$ then +$ del *.h5dumperr;* +$ endif +$ del *.h5dumpout;* +$ del h5dump_temp.dif;* $ ! $ENDSUBROUTINE diff --git a/vms/tools/h5import/check_h5import.com b/vms/tools/h5import/check_h5import.com index 178df88..87c854e 100644 --- a/vms/tools/h5import/check_h5import.com +++ b/vms/tools/h5import/check_h5import.com @@ -25,6 +25,7 @@ $ type sys$input $ ! Define symbols $ ! +$ $ current_dir = F$DIRECTRY() $ len = F$LENGTH(current_dir) $ temp = F$EXTRACT(0, len-19, current_dir) @@ -71,7 +72,7 @@ $ CALL TOOLTEST "fp1. -c textfp32. -o" test6.h5 $ ! $ type sys$input Testing ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed -$ CALL TOOLTEST "fp2. -c textfp64. -o" test7.h5 +$ CALL TOOLTEST "fp2. -c textfp64. -o" tes7.h5 $ ! $ type sys$input Testing BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed @@ -86,7 +87,8 @@ $ type sys$input $ CALL TOOLTEST "bin8. -c conbin8. -o" test10.h5 $ ! $ type sys$input - Testing BINARY I32 - rank 3 - Output BE + CHUNKED + + Testing BINARY I32 - rank 3 - Output BE + CHUNKED $ CALL TOOLTEST "bin32. -c conbin32. -o" test11.h5 $ ! $ type sys$input @@ -98,12 +100,19 @@ $ type sys$input $ CALL TOOLTEST "buin32. -c conbuin32. -o" test13.h5 $ $ +$ ! Delete temporary files +$ del *_out.h5;* +$ del *.h5importtxt;* +$ del b*.;* +$ del txti*.;* +$ del *.dif;* +$ ! $ $TOOLTEST: SUBROUTINE $ $ len = F$LENGTH(P2) $ base = F$EXTRACT(0,len-3,P2) -$ actual = base + "out.h5" +$ actual = base + "_out.h5" $ actual_dump = base + "out.h5importtxt" $ actual_dump_err = base + "out.h5importerr" $ expected_dump = base + ".h5importtxt" @@ -118,7 +127,7 @@ $ h5import 'P1 'actual' $ define/nolog sys$output 'actual_dump' $ define/nolog sys$error 'actual_dump_err' $ ! -$ ! Dump the actual and expected files +$ ! Dump the atual and expected files $ ! $ h5dump 'actual' $ deassign sys$output @@ -136,7 +145,7 @@ $ deassign sys$output $ deassign sys$error $ if F$SEARCH(expected_dump_err) .NES. "" $ then -$ set message/notext/nofacility/noidentification/noseverity +$ set message/notex/nofacility/noidentification/noseverity $ append 'expected_dump_err' 'expected_dump' $ set message/ntext/facility/identification/severity $ endif @@ -191,16 +200,16 @@ $ ! Append the result to the log file $ ! $ append h5dump_temp.dif h5import.log $ ! -$ ! Delete temporary files -$ if F$SEARCH("*out.h5;*") then del *out.h5;* -$ if F$SEARCH("*.dif;*") then del *.dif;* -$ 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*.;* -$ if F$SEARCH("*.dat;*") then del *.dat;* $ ! $ ! +$ ! Delete temporary files +$ ! +$ if F$SEARCH(actual_dump_err) .NES. "" +$ then +$ del *out.h5importerr;* +$ endif +$ if F$SEARCH(expected_dump_err) .NES. "" +$ then +$ del *.h5importerr;* +$ endif $ENDSUBROUTINE - diff --git a/vms/tools/h5repack/check_h5repack.com b/vms/tools/h5repack/check_h5repack.com index bacf767..1dcbc78 100644 --- a/vms/tools/h5repack/check_h5repack.com +++ b/vms/tools/h5repack/check_h5repack.com @@ -143,9 +143,6 @@ $ CALL TOOLTEST "-l dset_chunk:"""CONTI"""" h5repack_layout.h5 $ CALL TOOLTEST "-l dset_chunk:"""CHUNK"""=18x13" h5repack_layout.h5 $! $! -$ 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 @@ -182,6 +179,15 @@ $ ! $ write sys$output line $ ! $ ! +$ ! +$ ! Cleanup temporary files +$ ! +$ if F$SEARCH(output_err) .NES. "" +$ then +$ del *.h5repackerr;* +$ endif +$ del *.h5repackout;* +$ del *_out.h5;* $ENDSUBROUTINE |