From 30d4db89129a6bd98861485992bea6691df9b07b Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Thu, 29 Nov 2007 08:36:57 -0500 Subject: [svn-r14302] Purpose: Update Windows test scripts for recent changes Description: Minor changes were recently made in the linux test scripts for h5diff and h5repack. This brings Windows up-to-date. Note: I am still working on updates to testh5ls.bat-- there is one test that is failing, but should be ready soon. Tested: VS2005 on WinXP --- windows/tools/h5diff/testh5diff.bat | 6 +++--- windows/tools/h5repack/h5repack.bat | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat index 83dfc5e..fba7ef0 100644 --- a/windows/tools/h5diff/testh5diff.bat +++ b/windows/tools/h5diff/testh5diff.bat @@ -195,13 +195,13 @@ rem ############################################################################ call :tooltest h5diff_14.txt -r %file1% %file2% g1/dset1 g1/dset2 rem 1.5 with -d - call :tooltest h5diff_15.txt -r -d 5 %file1% %file2% g1/dset3 g1/dset4 + call :tooltest h5diff_15.txt --report --delta=5 %file1% %file2% g1/dset3 g1/dset4 rem 1.6.1 with -p (int) call :tooltest h5diff_16_1.txt -v -p 0.02 %file1% %file1% g1/dset5 g1/dset6 rem 1.6.2 with -p (unsigned long_long) - call :tooltest h5diff_16_2.txt -v -p 0.02 %file1% %file1% g1/dset7 g1/dset8 + call :tooltest h5diff_16_2.txt --verbose --relative=0.02 %file1% %file1% g1/dset7 g1/dset8 rem 1.6.3 with -p (double) call :tooltest h5diff_16_3.txt -v -p 0.02 %file1% %file1% g1/dset9 g1/dset10 @@ -389,7 +389,7 @@ rem ############################################################################ call :tooltest h5diff_626.txt -n 2 -n 3 %file1% %file2% g1/dset3 g1/dset4 rem 6.27: number larger than biggest difference - call :tooltest h5diff_627.txt -n 200 %file1% %file2% g1/dset3 g1/dset4 + call :tooltest h5diff_627.txt --count=200 %file1% %file2% g1/dset3 g1/dset4 rem 6.28: number smaller than smallest difference call :tooltest h5diff_628.txt -n 1 %file1% %file2% g1/dset3 g1/dset4 diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat index ae97db4..d0bf845 100644 --- a/windows/tools/h5repack/h5repack.bat +++ b/windows/tools/h5repack/h5repack.bat @@ -312,7 +312,7 @@ rem ) rem szip remove - set arg=%file7% -f dset_szip:NONE + set arg=%file7% --filter=dset_szip:NONE if not "%use_filter_szip_encoder%"=="yes" ( call :skip %arg% ) else if not "%use_filter_szip%"=="yes" ( @@ -483,7 +483,7 @@ rem rem layout options (these files have no filters) rem ######################################################## - call :tooltest %file4% -l dset2:CHUNK=20x10 + call :tooltest %file4% --layout=dset2:CHUNK=20x10 call :tooltest %file4% -l CHUNK=20x10 call :tooltest %file4% -l dset2:CONTI call :tooltest %file4% -l CONTI -- cgit v0.12