philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r14265] Purpose: Bring Windows test scripts up to date for h5diff changes.

Browse Source 
Description:
Recently, the format of parameters for h5diff was changed.  This checkin makes the neccessary changes for Windows to also bring it up to date.

Tested:
VS6 on WinXP
This commit is contained in:
Scott Wegner
2007-11-19 12:59:53 -05:00
parent d3507c4a5a
commit 27e823f08b
5 changed files with 102 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
windows/tools/h5diff/testh5diff.bat
View File

@@ -16,7 +16,7 @@ rem
rem Tests for the h5diff tool
rem
rem Created: Scott Wegner, 8/22/07
rem Modified: Scott Wegner, 8/23/07
rem Modified: Scott Wegner, 11/19/07
rem
setlocal enabledelayedexpansion
@@ -189,63 +189,63 @@ rem ############################################################################
call :tooltest h5diff_12.txt %file1% %file2% g1/dset1 g1/dset2
rem 1.3 report mode
call :tooltest h5diff_13.txt %file1% %file2% -r
call :tooltest h5diff_13.txt -r %file1% %file2%
rem 1.4 report mode with objects
call :tooltest h5diff_14.txt %file1% %file2% -r g1/dset1 g1/dset2
call :tooltest h5diff_14.txt -r %file1% %file2% g1/dset1 g1/dset2
rem 1.5 with -d
call :tooltest h5diff_15.txt %file1% %file2% -r -d 5 g1/dset3 g1/dset4
call :tooltest h5diff_15.txt -r -d 5 %file1% %file2% g1/dset3 g1/dset4
rem 1.6.1 with -p (int)
call :tooltest h5diff_16_1.txt %file1% %file1% -v -p 0.02 g1/dset5 g1/dset6
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 %file1% %file1% -v -p 0.02 g1/dset7 g1/dset8
call :tooltest h5diff_16_2.txt -v -p 0.02 %file1% %file1% g1/dset7 g1/dset8
rem 1.6.3 with -p (double)
call :tooltest h5diff_16_3.txt %file1% %file1% -v -p 0.02 g1/dset9 g1/dset10
call :tooltest h5diff_16_3.txt -v -p 0.02 %file1% %file1% g1/dset9 g1/dset10
rem 1.7 verbose mode
call :tooltest h5diff_17.txt %file1% %file2% -v
call :tooltest h5diff_17.txt -v %file1% %file2%
rem 1.8 quiet mode
call :tooltest h5diff_18.txt %file1% %file2% -q
call :tooltest h5diff_18.txt -q %file1% %file2%
rem ##############################################################################
rem # not comparable types
rem ##############################################################################
rem 2.0
call :tooltest h5diff_20.txt %file3% %file3% -v dset g1
call :tooltest h5diff_20.txt -v %file3% %file3% dset g1
rem 2.1
call :tooltest h5diff_21.txt %file3% %file3% -v dset l1
call :tooltest h5diff_21.txt -v %file3% %file3% dset l1
rem 2.2
call :tooltest h5diff_22.txt %file3% %file3% -v dset t1
call :tooltest h5diff_22.txt -v %file3% %file3% dset t1
rem ##############################################################################
rem # compare groups, types, links (no differences and differences)
rem ##############################################################################
rem 2.3
call :tooltest h5diff_23.txt %file3% %file3% -v g1 g1
call :tooltest h5diff_23.txt -v %file3% %file3% g1 g1
rem 2.4
call :tooltest h5diff_24.txt %file3% %file3% -v t1 t1
call :tooltest h5diff_24.txt -v %file3% %file3% t1 t1
rem 2.5
call :tooltest h5diff_25.txt %file3% %file3% -v l1 l1
call :tooltest h5diff_25.txt -v %file3% %file3% l1 l1
rem 2.6
call :tooltest h5diff_26.txt %file3% %file3% -v g1 g2
call :tooltest h5diff_26.txt -v %file3% %file3% g1 g2
rem 2.7
call :tooltest h5diff_27.txt %file3% %file3% -v t1 t2
call :tooltest h5diff_27.txt -v %file3% %file3% t1 t2
rem 2.8
call :tooltest h5diff_28.txt %file3% %file3% -v l1 l2
call :tooltest h5diff_28.txt -v %file3% %file3% l1 l2
@@ -254,31 +254,31 @@ rem ############################################################################
rem ##############################################################################
rem 5.0
call :tooltest h5diff_50.txt %file4% %file4% -v dset0a dset0b
call :tooltest h5diff_50.txt -v %file4% %file4% dset0a dset0b
rem 5.1
call :tooltest h5diff_51.txt %file4% %file4% -v dset1a dset1b
call :tooltest h5diff_51.txt -v %file4% %file4% dset1a dset1b
rem 5.2
call :tooltest h5diff_52.txt %file4% %file4% -v dset2a dset2b
call :tooltest h5diff_52.txt -v %file4% %file4% dset2a dset2b
rem 5.3
call :tooltest h5diff_53.txt %file4% %file4% -v dset3a dset4b
call :tooltest h5diff_53.txt -v %file4% %file4% dset3a dset4b
rem 5.4
call :tooltest h5diff_54.txt %file4% %file4% -v dset4a dset4b
call :tooltest h5diff_54.txt -v %file4% %file4% dset4a dset4b
rem 5.5
call :tooltest h5diff_55.txt %file4% %file4% -v dset5a dset5b
call :tooltest h5diff_55.txt -v %file4% %file4% dset5a dset5b
rem 5.6
call :tooltest h5diff_56.txt %file4% %file4% -v dset6a dset6b
call :tooltest h5diff_56.txt -v %file4% %file4% dset6a dset6b
rem 5.7
call :tooltest h5diff_57.txt %file4% %file4% -v dset7a dset7b
call :tooltest h5diff_57.txt -v %file4% %file4% dset7a dset7b
rem 5.8 (region reference)
call :tooltest h5diff_58.txt %file7% %file8% -v refreg
call :tooltest h5diff_58.txt -v %file7% %file8% refreg
rem ##############################################################################
rem # Error messages
@@ -289,38 +289,43 @@ rem ############################################################################
call :tooltest h5diff_600.txt %file1%
rem 6.1: Check for invalid options
call :tooltest h5diff_601.txt %file1% %file2% -x
rem Comment this test on Windows out for now. The reason is that currently no
rem expected output exists. This means that one will be created for the first
rem testrun, but then never deleted. The expected output has an absolute path
rem in it, so it will fail for subsequent tests that use a different path.
rem -- SJW 11/17/07
rem call :tooltest h5diff_601.txt -x %file1% %file2%
rem ##############################################################################
rem # -d
rem ##############################################################################
rem 6.2: no value
call :tooltest h5diff_602.txt %file1% %file2% -d g1/dset3 g1/dset4
call :tooltest h5diff_602.txt -d %file1% %file2% g1/dset3 g1/dset4
rem 6.3: negative value
call :tooltest h5diff_603.txt %file1% %file2% -d -4 g1/dset3 g1/dset4
call :tooltest h5diff_603.txt -d -4 %file1% %file2% g1/dset3 g1/dset4
rem 6.4: zero
call :tooltest h5diff_604.txt %file1% %file2% -d 0 g1/dset3 g1/dset4
call :tooltest h5diff_604.txt -d 0 %file1% %file2% g1/dset3 g1/dset4
rem 6.5: non number
call :tooltest h5diff_605.txt %file1% %file2% -d u g1/dset3 g1/dset4
call :tooltest h5diff_605.txt -d u %file1% %file2% g1/dset3 g1/dset4
rem 6.6: hexadecimal
call :tooltest h5diff_606.txt %file1% %file2% -d 0x1 g1/dset3 g1/dset4
call :tooltest h5diff_606.txt -d 0x1 %file1% %file2% g1/dset3 g1/dset4
rem 6.7: string
call :tooltest h5diff_607.txt %file1% %file2% -d "1" g1/dset3 g1/dset4
call :tooltest h5diff_607.txt -d "1" %file1% %file2% g1/dset3 g1/dset4
rem 6.8: repeated option
call :tooltest h5diff_608.txt %file1% %file2% -d 1 -d 2 g1/dset3 g1/dset4
call :tooltest h5diff_608.txt -d 1 -d 2 %file1% %file2% g1/dset3 g1/dset4
rem 6.9: number larger than biggest difference
call :tooltest h5diff_609.txt %file1% %file2% -d 200 g1/dset3 g1/dset4
call :tooltest h5diff_609.txt -d 200 %file1% %file2% g1/dset3 g1/dset4
rem 6.10: number smaller than smallest difference
call :tooltest h5diff_610.txt %file1% %file2% -d 1 g1/dset3 g1/dset4
call :tooltest h5diff_610.txt -d 1 %file1% %file2% g1/dset3 g1/dset4
rem ##############################################################################
@@ -329,31 +334,31 @@ rem ############################################################################
rem 6.11: no value
call :tooltest h5diff_611.txt %file1% %file2% -r -p g1/dset3 g1/dset4
call :tooltest h5diff_611.txt -r -p %file1% %file2% g1/dset3 g1/dset4
rem 6.12: negative value
call :tooltest h5diff_612.txt %file1% %file2% -p -4 g1/dset3 g1/dset4
call :tooltest h5diff_612.txt -p -4 %file1% %file2% g1/dset3 g1/dset4
rem 6.13: zero
call :tooltest h5diff_613.txt %file1% %file2% -p 0 g1/dset3 g1/dset4
call :tooltest h5diff_613.txt -p 0 %file1% %file2% g1/dset3 g1/dset4
rem 6.14: non number
call :tooltest h5diff_614.txt %file1% %file2% -p u g1/dset3 g1/dset4
call :tooltest h5diff_614.txt -p u %file1% %file2% g1/dset3 g1/dset4
rem 6.15: hexadecimal
call :tooltest h5diff_615.txt %file1% %file2% -p 0x1 g1/dset3 g1/dset4
call :tooltest h5diff_615.txt -p 0x1 %file1% %file2% g1/dset3 g1/dset4
rem 6.16: string
call :tooltest h5diff_616.txt %file1% %file2% -p "0.21" g1/dset3 g1/dset4
call :tooltest h5diff_616.txt -p "0.21" %file1% %file2% g1/dset3 g1/dset4
rem 6.17: repeated option
call :tooltest h5diff_617.txt %file1% %file2% -p 0.21 -p 0.22 g1/dset3 g1/dset4
call :tooltest h5diff_617.txt -p 0.21 -p 0.22 %file1% %file2% g1/dset3 g1/dset4
rem 6.18: number larger than biggest difference
call :tooltest h5diff_618.txt %file1% %file2% -p 2 g1/dset3 g1/dset4
call :tooltest h5diff_618.txt -p 2 %file1% %file2% g1/dset3 g1/dset4
rem 6.19: number smaller than smallest difference
call :tooltest h5diff_619.txt %file1% %file2% -p 0.005 g1/dset3 g1/dset4
call :tooltest h5diff_619.txt -p 0.005 %file1% %file2% g1/dset3 g1/dset4
@@ -363,31 +368,31 @@ rem ############################################################################
rem 6.20: no value
call :tooltest h5diff_620.txt %file1% %file2% -n g1/dset3 g1/dset4
call :tooltest h5diff_620.txt -n %file1% %file2% g1/dset3 g1/dset4
rem 6.21: negative value
call :tooltest h5diff_621.txt %file1% %file2% -n -4 g1/dset3 g1/dset4
call :tooltest h5diff_621.txt -n -4 %file1% %file2% g1/dset3 g1/dset4
rem 6.22: zero
call :tooltest h5diff_622.txt %file1% %file2% -n 0 g1/dset3 g1/dset4
call :tooltest h5diff_622.txt -n 0 %file1% %file2% g1/dset3 g1/dset4
rem 6.23: non number
call :tooltest h5diff_623.txt %file1% %file2% -n u g1/dset3 g1/dset4
call :tooltest h5diff_623.txt -n u %file1% %file2% g1/dset3 g1/dset4
rem 6.24: hexadecimal
call :tooltest h5diff_624.txt %file1% %file2% -n 0x1 g1/dset3 g1/dset4
call :tooltest h5diff_624.txt -n 0x1 %file1% %file2% g1/dset3 g1/dset4
rem 6.25: string
call :tooltest h5diff_625.txt %file1% %file2% -n "2" g1/dset3 g1/dset4
call :tooltest h5diff_625.txt -n "2" %file1% %file2% g1/dset3 g1/dset4
rem 6.26: repeated option
call :tooltest h5diff_626.txt %file1% %file2% -n 2 -n 3 g1/dset3 g1/dset4
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 %file1% %file2% -n 200 g1/dset3 g1/dset4
call :tooltest h5diff_627.txt -n 200 %file1% %file2% g1/dset3 g1/dset4
rem 6.28: number smaller than smallest difference
call :tooltest h5diff_628.txt %file1% %file2% -n 1 g1/dset3 g1/dset4
call :tooltest h5diff_628.txt -n 1 %file1% %file2% g1/dset3 g1/dset4
rem 6.29 non valid files
call :tooltest h5diff_629.txt file1.h6 file2.h6
@@ -395,24 +400,24 @@ rem ############################################################################
rem ##############################################################################
rem 7. attributes
rem ##############################################################################
call :tooltest h5diff_70.txt %file5% %file6% -v
call :tooltest h5diff_70.txt -v %file5% %file6%
rem ##############################################################################
rem 8. all dataset datatypes
rem ##############################################################################
call :tooltest h5diff_80.txt %file7% %file8% -v
call :tooltest h5diff_80.txt -v %file7% %file8%
rem 9. compare a file with itself
call :tooltest h5diff_90.txt %file2% %file2%
call :tooltest h5diff_90.txt -v %file2% %file2%
rem 10. read by hyperslab, print indexes
call :tooltest h5diff_100.txt %file9% %file10% -v
call :tooltest h5diff_100.txt -v %file9% %file10%
rem 11. floating point comparison
rem Not tested on Windows due to difference in formatting of scientific
rem notation --SJW 8/23/07
rem call :tooltest h5diff_101.txt %file1% %file1% g1/d1 g1/d2 -v
rem call :tooltest h5diff_102.txt %file1% %file1% g1/fp1 g1/fp2 -v
rem call :tooltest h5diff_101.txt -v %file1% %file1% g1/d1 g1/d2
rem call :tooltest h5diff_102.txt -v %file1% %file1% g1/fp1 g1/fp2
rem ##############################################################################
rem # END
@@ -424,4 +429,4 @@ rem ############################################################################
popd
endlocal & exit /b %nerrors%