From 793510b1c19a1c06e5a241e7c71d4d315049de36 Mon Sep 17 00:00:00 2001 From: Scott Wegner Date: Mon, 6 Oct 2008 11:16:42 -0500 Subject: [svn-r15783] Purpose: Update Windows h5repack test script for new directory Description: The h5repack test files were added to a new testfiles/ subdirectory, and the test script update. This checkin brings those changes to Windows. We also re-enable a test for the userblock which was disabled for other reasons before. Note: One h5repack test is still failing, but I think it's a minor error that Pedro and I can correct fairly easily later today. Tested VS2005 on WinXP --- windows/tools/h5repack/h5repack.bat | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat index 4e178c9..59f3310 100644 --- a/windows/tools/h5repack/h5repack.bat +++ b/windows/tools/h5repack/h5repack.bat @@ -42,13 +42,11 @@ set h5diff=..\h5diff%2\%1\h5diff%2 rem The path of the h5diff tool binary set h5diff_bin=%CD%\%h5diff% -rem The tool name set h5detectszip=testh5repack_detect_szip%2 -rem The path of the tool binary set h5detectszip_bin=%CD%\..\testfiles\%h5detectszip%\%1\%h5detectszip% -set info_file=..\testfiles\info.h5repack +set info_file=testfiles\info.h5repack set file0=h5repack_fill.h5 set file1=h5repack_objs.h5 @@ -68,7 +66,7 @@ set file13=h5repack_soffset.h5 set nerrors=0 set verbose=yes -if not exist ..\testfiles mkdir ..\testfiles + goto main @@ -133,7 +131,7 @@ rem :tooltest rem Run test. - set infile=%CD%\..\testfiles\%1 + set infile=%CD%\testfiles\%1 rem Linux uses a $path variable here, but it is unneccessary, and will rem corrupt our Windows PATH if we use it. --SJW 8/28/07 rem set path=%CD% @@ -167,7 +165,7 @@ rem :tooltest0 rem Run test. - set infile=%CD%\..\testfiles\%1 + set infile=%CD%\testfiles\%1 rem Linux uses a $path variable here, but it is unneccessary, and will rem corrupt our Windows PATH if we use it. --SJW 8/28/07 rem set path=%CD% @@ -590,13 +588,8 @@ rem ) rem add a userblock to file - rem Temporarily comment test on Windows. The ublock.bin test file is inaccessible - rem because h5repacktst is run from a different folder than on other platforms. - rem Until ublock.bin is added to SVN and distributed with the source package, - rem we cannot test this on Windows. --SJW 9/29/08 - set arg=%file1% -u ublock.bin -b 2048 - call :skip %arg% - rem call :tooltest %arg% + set arg=%file1% -u testfiles\ublock.bin -b 2048 + call :tooltest %arg% rem add alignment set arg=%file1% -t 1 -a 1 -- cgit v0.12