summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Wegner <swegner@hdfgroup.org>2008-06-19 22:13:22 (GMT)
committerScott Wegner <swegner@hdfgroup.org>2008-06-19 22:13:22 (GMT)
commit01c7dab76efada1c37f899a0a2679130507524d6 (patch)
tree2496f10e8b43b3bfbeca8320a7177cbe937a3060
parent5bb358b012bb5054422cc1f8ed1302bcbc30c93c (diff)
downloadhdf5-01c7dab76efada1c37f899a0a2679130507524d6.zip
hdf5-01c7dab76efada1c37f899a0a2679130507524d6.tar.gz
hdf5-01c7dab76efada1c37f899a0a2679130507524d6.tar.bz2
[svn-r15245] Purpose: Update h5diff test for new testfiles folder
Description: The testfiles for h5diff were moved the a new folder, and the general script was updated. This checkin makes the minor changes neccessary for Windows to use the new folder. Tested: VS2005 on WinXP
-rw-r--r--windows/tools/h5diff/testh5diff.bat11
1 files changed, 6 insertions, 5 deletions
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
index d3c407a..3cecd53 100644
--- a/windows/tools/h5diff/testh5diff.bat
+++ b/windows/tools/h5diff/testh5diff.bat
@@ -26,6 +26,7 @@ rem ############################################################################
rem test file names
rem ############################################################################
+
set file1=h5diff_basic1.h5
set file2=h5diff_basic2.h5
set file3=h5diff_types.h5
@@ -48,7 +49,7 @@ set verbose=yes
rem default to run h5diff tests
set pmode=
-if not exist ..\testfiles mkdir ..\testfiles
+if not exist .\testfiles mkdir .\testfiles
rem Parse options
rem On Windows, we don't parse, because we only want to worry about
@@ -98,9 +99,9 @@ rem `.out'. The actual output is not removed if HDF5_NOCLEANUP has a
rem non-zero value.
rem
:tooltest
- set expect=%CD%\..\testfiles\%1
- set actual=%CD%\..\testfiles\%~n1.out
- set actual_err=%CD%\..\testfiles\~n1.err
+ set expect=%CD%\testfiles\%1
+ set actual=%CD%\testfiles\%~n1.out
+ set actual_err=%CD%\testfiles\~n1.err
set actual_sav=%actual%-sav
set actual_err_sav=%actual_err%-sav
@@ -125,7 +126,7 @@ rem
rem Remove quotes here, because Linux 'echo' command strips them
echo.Expected output for 'h5diff %params:"=%'
echo.#############################
- pushd ..\testfiles
+ pushd testfiles
%h5diff_bin% %params%
popd
) > %actual% 2> %actual_err%