summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2008-08-04 21:50:37 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2008-08-04 21:50:37 (GMT)
commit90aa3cb287a11582f518b4f2c61fa0610c6f8156 (patch)
treed804df4f1410c77cb1ea50aa4bbc38b85b475904
parent5eb94a3eb5bb91e7ae3ac9d35566ef7a79a4cfb8 (diff)
downloadhdf5-90aa3cb287a11582f518b4f2c61fa0610c6f8156.zip
hdf5-90aa3cb287a11582f518b4f2c61fa0610c6f8156.tar.gz
hdf5-90aa3cb287a11582f518b4f2c61fa0610c6f8156.tar.bz2
[svn-r15430] Purpose: Update Windows test script for new h5diff option: -c
Description: A new parameter was added to h5diff recently. We add a new test to the h5diff script, and change the syntax in which h5diff is called from the h5repack test script Tested: VS2005 on WinXP
-rw-r--r--windows/tools/h5diff/testh5diff.bat6
-rw-r--r--windows/tools/h5repack/h5repack.bat2
2 files changed, 7 insertions, 1 deletions
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
index 2ae5b10..cf178b1 100644
--- a/windows/tools/h5diff/testh5diff.bat
+++ b/windows/tools/h5diff/testh5diff.bat
@@ -38,6 +38,7 @@ set srcfile7=h5diff_dset1.h5
set srcfile8=h5diff_dset2.h5
set srcfile9=h5diff_hyper1.h5
set srcfile10=h5diff_hyper2.h5
+set srcfile11=h5diff_empty.h5
set file1=%indir%\h5diff_basic1.h5
set file2=%indir%\h5diff_basic2.h5
@@ -49,6 +50,7 @@ set file7=%indir%\h5diff_dset1.h5
set file8=%indir%\h5diff_dset2.h5
set file9=%indir%\h5diff_hyper1.h5
set file10=%indir%\h5diff_hyper2.h5
+set file11=%indir%\h5diff_empty.h5
rem The tool name
@@ -247,6 +249,10 @@ rem ############################################################################
call :testing %h5diff% -q %srcfile1% %srcfile2%
call :tooltest h5diff_18.txt -q %file1% %file2%
+ rem 1.9 contents mode
+ call :testing %h5diff% -v -c %srcfile1% %srcfile11%
+ call :tooltest h5diff_19.txt -v -c %file1% %file11%
+
rem ##############################################################################
rem # not comparable types
rem ##############################################################################
diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat
index a91dcb9..30ddaab 100644
--- a/windows/tools/h5repack/h5repack.bat
+++ b/windows/tools/h5repack/h5repack.bat
@@ -114,7 +114,7 @@ rem was unavailable)
rem Call the h5diff tool
rem
:difftest
- %h5diff_bin% -q %*
+ %h5diff_bin% -q -c %*
if %errorlevel% neq 0 (
call :verify *FAILED* %*
set /a nerrors=!nerrors!+1