From 465bc848feab64819cc0d4c392d457163c6eb007 Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Tue, 27 Feb 2007 15:29:33 -0500 Subject: [svn-r13423] Changed Windows h5diff test file /tools/difftest.BAT to work with reverted naming scheme of test files (.txt rather than .wri) Tested: Visual Studio 6.0 on Windows XP --- windows/tools/difftest.BAT | 133 +++++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 66 deletions(-) diff --git a/windows/tools/difftest.BAT b/windows/tools/difftest.BAT index bbf6620..d353e3a 100755 --- a/windows/tools/difftest.BAT +++ b/windows/tools/difftest.BAT @@ -102,47 +102,48 @@ echo.**************************************************** ::1.0 set flag=-h -call %tooltest% h5diff_10.wri +call %tooltest% h5diff_10.txt ::1.1 normal mode set flag=%file1% %file2% -call %tooltest% h5diff_11.wri +call %tooltest% h5diff_11.txt ::1.2 normal mode with objects set flag=%file1% %file2% g1/dset1 g1/dset2 -call %tooltest% h5diff_12.wri +call %tooltest% h5diff_12.txt ::1.3 report mode set flag=%file1% %file2% -r -call %tooltest% h5diff_13.wri +call %tooltest% h5diff_13.txt ::1.4 report mode with objects set flag=%file1% %file2% -r g1/dset1 g1/dset2 -call %tooltest% h5diff_14.wri +call %tooltest% h5diff_14.txt ::1.5 with -d set flag=%file1% %file2% -r -d 5 g1/dset3 g1/dset4 -call %tooltest% h5diff_15.wri +call %tooltest% h5diff_15.txt ::1.6.1 with -p (int) set flag=%file1% %file1% -v -p 0.02 g1/dset5 g1/dset6 -call %tooltest% h5diff_16_1.wri +call %tooltest% h5diff_16_1.txt +:: Commented out in unix test script (due to cross-platform errors) ::1.6.2 with -p (unsigned long_long) -set flag=%file1% %file1% -v -p 0.02 g1/dset7 g1/dset8 -call %tooltest% h5diff_16_2.wri +:: set flag=%file1% %file1% -v -p 0.02 g1/dset7 g1/dset8 +:: call %tooltest% h5diff_16_2.txt ::1.6.2 with -p (unsigned long_long) set flag=%file1% %file1% -v -p 0.02 g1/dset9 g1/dset10 -call %tooltest% h5diff_16_3.wri +call %tooltest% h5diff_16_3.txt ::1.7 verbose mode set flag=%file1% %file2% -v -call %tooltest% h5diff_17.wri +call %tooltest% h5diff_17.txt ::1.8 quiet mode set flag=%file1% %file2% -q -call %tooltest% h5diff_18.wri +call %tooltest% h5diff_18.txt ::--------------------- ::Not Comparable Types @@ -150,41 +151,41 @@ call %tooltest% h5diff_18.wri ::2.0 set flag=%file3% %file3% -v dset g1 -call %tooltest% h5diff_20.wri +call %tooltest% h5diff_20.txt ::2.1 set flag=%file3% %file3% -v dset l1 -call %tooltest% h5diff_21.wri +call %tooltest% h5diff_21.txt ::2.2 set flag=%file3% %file3% -v dset t1 -call %tooltest% h5diff_22.wri +call %tooltest% h5diff_22.txt ::2.3 set flag=%file3% %file3% -v g1 g1 -call %tooltest% h5diff_23.wri +call %tooltest% h5diff_23.txt ::2.4 set flag=%file3% %file3% -v t1 t1 -call %tooltest% h5diff_24.wri +call %tooltest% h5diff_24.txt ::2.5 set flag=%file3% %file3% -v l1 l1 -call %tooltest% h5diff_25.wri +call %tooltest% h5diff_25.txt ::2.6 set flag=%file3% %file3% -v g1 g2 -call %tooltest% h5diff_26.wri +call %tooltest% h5diff_26.txt ::2.7 set flag=%file3% %file3% -v t1 t2 -call %tooltest% h5diff_27.wri +call %tooltest% h5diff_27.txt ::2.8 set flag=%file3% %file3% -v l1 l2 -call %tooltest% h5diff_28.wri +call %tooltest% h5diff_28.txt @@ -194,47 +195,47 @@ call %tooltest% h5diff_28.wri ::5.0 set flag=%file4% %file4% -v dset0a dset0b -call %tooltest% h5diff_50.wri +call %tooltest% h5diff_50.txt ::5.1 set flag=%file4% %file4% -v dset1a dset1b -call %tooltest% h5diff_51.wri +call %tooltest% h5diff_51.txt ::5.2 set flag=%file4% %file4% -v dset2a dset2b -call %tooltest% h5diff_52.wri +call %tooltest% h5diff_52.txt ::5.3 set flag=%file4% %file4% -v dset3a dset4b -call %tooltest% h5diff_53.wri +call %tooltest% h5diff_53.txt ::5.4 set flag=%file4% %file4% -v dset4a dset4b -call %tooltest% h5diff_54.wri +call %tooltest% h5diff_54.txt ::5.5 set flag=%file4% %file4% -v dset5a dset5b -call %tooltest% h5diff_55.wri +call %tooltest% h5diff_55.txt ::5.6 set flag=%file4% %file4% -v dset6a dset6b -call %tooltest% h5diff_56.wri +call %tooltest% h5diff_56.txt ::5.7 set flag=%file4% %file4% -v dset7a dset7b -call %tooltest% h5diff_57.wri +call %tooltest% h5diff_57.txt ::5.8 long_long test; different format of long_long print in Linux and IRIX set flag=%file7% %file8% -v refreg -call %tooltest% h5diff_58.wri +call %tooltest% h5diff_58.txt :: -------------- :: Error messages @@ -242,11 +243,11 @@ call %tooltest% h5diff_58.wri ::6.0: Check if the command line number of arguments is less than 3 set flag=%file1% -call %tooltest% h5diff_600.wri +call %tooltest% h5diff_600.txt ::6.1: Check for invalid options set flag=%file1% %file2% -x -call %tooltest% h5diff_601.wri +call %tooltest% h5diff_601.txt :: ---- :: -d @@ -254,47 +255,47 @@ call %tooltest% h5diff_601.wri ::6.2: no value set flag=%file1% %file2% -d g1/dset3 g1/dset4 -call %tooltest% h5diff_602.wri +call %tooltest% h5diff_602.txt ::6.3: negative value set flag=%file1% %file2% -d -4 g1/dset3 g1/dset4 -call %tooltest% h5diff_603.wri +call %tooltest% h5diff_603.txt ::6.4: zero set flag=%file1% %file2% -d 0 g1/dset3 g1/dset4 -call %tooltest% h5diff_604.wri +call %tooltest% h5diff_604.txt ::6.5: non number set flag=%file1% %file2% -d u g1/dset3 g1/dset4 -call %tooltest% h5diff_605.wri +call %tooltest% h5diff_605.txt ::6.6: hexadecimal set flag=%file1% %file2% -d 0x1 g1/dset3 g1/dset4 -call %tooltest% h5diff_606.wri +call %tooltest% h5diff_606.txt ::6.7: string set flag=%file1% %file2% -d "1" g1/dset3 g1/dset4 -call %tooltest% h5diff_607.wri +call %tooltest% h5diff_607.txt ::6.8: repeated option set flag=%file1% %file2% -d 1 -d 2 g1/dset3 g1/dset4 -call %tooltest% h5diff_608.wri +call %tooltest% h5diff_608.txt ::6.9: number larger than biggest difference set flag=%file1% %file2% -d 200 g1/dset3 g1/dset4 -call %tooltest% h5diff_609.wri +call %tooltest% h5diff_609.txt ::6.10: number smaller than smallest difference set flag=%file1% %file2% -d 1 g1/dset3 g1/dset4 -call %tooltest% h5diff_610.wri +call %tooltest% h5diff_610.txt ::--- ::-p @@ -303,50 +304,50 @@ call %tooltest% h5diff_610.wri ::6.11: no value set flag=%file1% %file2% -r -p g1/dset3 g1/dset4 -call %tooltest% h5diff_611.wri +call %tooltest% h5diff_611.txt ::6.12: negative value set flag=%file1% %file2% -p -4 g1/dset3 g1/dset4 -call %tooltest% h5diff_612.wri +call %tooltest% h5diff_612.txt ::6.13: zero set flag=%file1% %file2% -p 0 g1/dset3 g1/dset4 -call %tooltest% h5diff_613.wri +call %tooltest% h5diff_613.txt ::6.14: non number set flag=%file1% %file2% -p u g1/dset3 g1/dset4 -call %tooltest% h5diff_614.wri +call %tooltest% h5diff_614.txt ::6.15: hexadecimal set flag=%file1% %file2% -p 0x1 g1/dset3 g1/dset4 -call %tooltest% h5diff_615.wri +call %tooltest% h5diff_615.txt ::6.16: string set flag=%file1% %file2% -p "0.21" g1/dset3 g1/dset4 -call %tooltest% h5diff_616.wri +call %tooltest% h5diff_616.txt ::6.17: repeated option set flag=%file1% %file2% -p 0.21 -p 0.22 g1/dset3 g1/dset4 -call %tooltest% h5diff_617.wri +call %tooltest% h5diff_617.txt ::6.18: number larger than biggest difference set flag=%file1% %file2% -p 2 g1/dset3 g1/dset4 -call %tooltest% h5diff_618.wri +call %tooltest% h5diff_618.txt ::6.19: number smaller than smallest difference set flag=%file1% %file2% -p 0.005 g1/dset3 g1/dset4 -call %tooltest% h5diff_619.wri +call %tooltest% h5diff_619.txt ::--- @@ -355,61 +356,61 @@ call %tooltest% h5diff_619.wri ::6.20: no value set flag=%file1% %file2% -n g1/dset3 g1/dset4 -call %tooltest% h5diff_620.wri +call %tooltest% h5diff_620.txt ::6.21: negative value set flag=%file1% %file2% -n -4 g1/dset3 g1/dset4 -call %tooltest% h5diff_621.wri +call %tooltest% h5diff_621.txt ::6.22: zero set flag=%file1% %file2% -n 0 g1/dset3 g1/dset4 -call %tooltest% h5diff_622.wri +call %tooltest% h5diff_622.txt ::6.23: non number set flag=%file1% %file2% -n u g1/dset3 g1/dset4 -call %tooltest% h5diff_623.wri +call %tooltest% h5diff_623.txt ::6.24: hexadecimal set flag=%file1% %file2% -n 0x1 g1/dset3 g1/dset4 -call %tooltest% h5diff_624.wri +call %tooltest% h5diff_624.txt ::6.25: string set flag=%file1% %file2% -n "2" g1/dset3 g1/dset4 -call %tooltest% h5diff_625.wri +call %tooltest% h5diff_625.txt ::6.26: repeated option set flag=%file1% %file2% -n 2 -n 3 g1/dset3 g1/dset4 -call %tooltest% h5diff_626.wri +call %tooltest% h5diff_626.txt ::6.27: number larger than biggest difference set flag=%file1% %file2% -n 200 g1/dset3 g1/dset4 -call %tooltest% h5diff_627.wri +call %tooltest% h5diff_627.txt ::6.28: number smaller than smallest difference set flag=%file1% %file2% -n 1 g1/dset3 g1/dset4 -call %tooltest% h5diff_628.wri +call %tooltest% h5diff_628.txt ::6.29: non valid %files set flag=file1.h6 file2.h6 -call %tooltest% h5diff_629.wri +call %tooltest% h5diff_629.txt ::-------------- ::7. attributes ::-------------- set flag=%file5% %file6% -v -call %tooltest% h5diff_70.wri +call %tooltest% h5diff_70.txt ::------------------------- @@ -417,7 +418,7 @@ call %tooltest% h5diff_70.wri ::------------------------- set flag=%file7% %file8% -v -call %tooltest% h5diff_80.wri +call %tooltest% h5diff_80.txt ::----------------------------- @@ -425,14 +426,14 @@ call %tooltest% h5diff_80.wri ::----------------------------- set flag=%file1% %file1% -call %tooltest% h5diff_90.wri +call %tooltest% h5diff_90.txt ::----------------------------- ::10. read by hyperslab, print indexes ::----------------------------- set flag=%file9% %file10% -v -call %tooltest% h5diff_100.wri +call %tooltest% h5diff_100.txt ::----------------------------- ::11. floating point comparison @@ -440,10 +441,10 @@ call %tooltest% h5diff_100.wri REM Not tested on Windows due to difference in formatting of scientific notation REM set flag=%file1% %file1% /g1/d1 g1/d2 -v -REM call %tooltest% h5diff_101.wri +REM call %tooltest% h5diff_101.txt REM set flag=%file1% %file1% /g1/fp1 g1/fp2 -v -REM call %tooltest% h5diff_102.wri +REM call %tooltest% h5diff_102.txt ::Change directory to hdf5\tools cd ..\.. -- cgit v0.12