[svn-r11945] Purpose:

Batch file improvement
Description:
Make tool test batch files easier to maintain
Solution:

Platforms tested:
Windows XP
Misc. update:

1 files changed, 399 insertions, 984 deletions

diff --git a/windows/tools/repacktest.BAT b/windows/tools/repacktest.BAT
index 7daf7f1..c52864c 100755
--- a/windows/tools/repacktest.BAT
+++ b/windows/tools/repacktest.BAT
@@ -1,1013 +1,428 @@
-@REM Copyright by the Board of Trustees of the University of Illinois.
-@REM All rights reserved.
-@REM
-@REM This file is part of HDF5.  The full HDF5 copyright notice, including
-@REM terms governing use, modification, and redistribution, is contained in
-@REM the files COPYING and Copyright.html.  COPYING can be found at the root
-@REM of the source code distribution tree; Copyright.html can be found at the
-@REM root level of an installed copy of the electronic HDF5 document set and
-@REM is linked from the top-level documents page.  It can also be found at
-@REM http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
-@REM access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-
-@ ECHO OFF
-
-REM The Dynamic Discovery of Szip Encoder features is implemented in this batch file.
-REM We do not need to manually set HDF5_SZIP_ENCODE environment variable.
-REM We will check whether the SZIP library available includes encoder or not by 
-REM calling the szip encoder detecting executable file testh5repack_detect_szip(dll).exe
-REM and check the printed value.
-REM If the printed value is "yes", then the SZIP library has encoder, HDF5_SZIP_ENCODE will be set as 1.
-REM Otherwise,  HDF5_SZIP_ENCODE will be set as 0, and some tests will be skipped.
-
-FOR /F "delims=" %%a in ('testfiles\testh5repack_detect_szip%2\%1\testh5repack_detect_szip%2.exe') Do Set "Output=%%a"
-if "%Output%"=="yes" (
-	Set HDF5_SZIP_ENCODE=1
-)	else (
-	Set HDF5_SZIP_ENCODE=0
-)
+@echo off
+:: Copyright by the Board of Trustees of the University of Illinois.
+:: All rights reserved.
+::
+:: This file is part of HDF5.  The full HDF5 copyright notice, including
+:: terms governing use, modification, and redistribution, is contained in
+:: the files COPYING and Copyright.html.  COPYING can be found at the root
+:: of the source code distribution tree; Copyright.html can be found at the
+:: root level of an installed copy of the electronic HDF5 document set and
+:: is linked from the top-level documents page.  It can also be found at
+:: http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+:: access to either file, you may request a copy from hdfhelpncsa.uiuc.edu.
+
+::This batch file is for h5repack tests
+::Usage
+:: repacktest release  -- release static version
+:: repacktest debug  -- debug static version
+:: repacktest release dll -- release dll version
+:: repacktest debug dll -- debug dll version
+:: Written By: Fang GUO
+:: Date      : Jan. 12, 2006
+
+
+    :: We will check whether the SZIP library available includes encoder or not by 
+		:: calling the szip encoder detecting executable file testh5repack_detect_szip(dll).exe
+		:: and check the printed value.
+		:: If the printed value is "yes", then the SZIP library has encoder, HDF5_SZIP_ENCODE will be set as 1.
+		:: Otherwise,  HDF5_SZIP_ENCODE will be set as 0, and some tests will be skipped.
+
+     FOR /F "delims=" %%a in ('testfiles\testh5repack_detect_szip%2\%1\testh5repack_detect_szip%2.exe') Do Set "Output=%%a"
+     if "%Output%"=="yes" (
+	   Set HDF5_SZIP_ENCODE=1
+     )	else (
+	   Set HDF5_SZIP_ENCODE=0
+     )
+
+:: Track total number of testing errors
+   set /A totalerr=0
+   set /A totalskip=0
+
+::*******************************************************************
+:: Generate a new temp directory for test h5repack and reference file
+::*******************************************************************
+		::Make a temporary directory for testing h5repack
+    mkdir temptest
+    
+    :: Reference Files 
+    :: After running h5repack with a input .h5 file, it will use 
+    :: h5diff to compare the expected .h5 file with the output
+    :: .h5 file generated by h5repack. The comparison results will be 
+    :: one of the following two cases.
+
+    :: Case 1: No difference between the expected .h5 and .h5 generated by h5repack file
+    type nul > temptest\empty.txt
+    
+    ::Case 2: For test1.h5 and test2.h5, the output will be "Some objects 
+    :: are not comparable", but actually there is no difference between 
+    
+		type nul > temptest\notcomp.txt
+		echo -------------------------------->>temptest\notcomp.txt
+		echo Some objects are not comparable>> temptest\notcomp.txt
+		echo -------------------------------->>temptest\notcomp.txt
+		echo Use -v for a list of objects.>> temptest\notcomp.txt
+    
+    :: Set two variables to contain the following two file names and paths
+    set nodiff=..\..\temptest\empty.txt
+    set notcomp=..\..\temptest\notcomp.txt
+
+::****************************************************
+:: Set the Environment Variables & Change Dir to .EXE
+::****************************************************
+
+		:: The first incoming parameter should be configuration (debug or release)
+		   set p1=%1
+		:: The second parameter should be the types of library (dll or blank)
+		   set p2=%2
+			
+    :: Set file name for the test results
+       set tempResults=repacktest%2_%1.txt
+    :: Set exe file name
+       set exefile=h5repack%p2%
+    :: Set a variable for the sub batch file tools\tooltest.bat
+       set tooltest=..\..\tooltest
+   
+    :: Set Variables to contain the file name and path of input and output files for testing h5repack
+       for %%v in (0 1 2 3 4 5 _szip _deflate _shuffle _fletcher32 _nbit _scaleoffset _all) do (
+         set test%%v=..\..\testfiles\test%%v.h5
+         set output%%v=..\..\temptest\out.test%%v.h5
+       )
+  
+     :: Creat the file for saving the tests results
+       type nul > %tempResults%
+
+     :: Change to the direcotory where the .exe file is located
+       cd h5repack%p2%\%p1%
+
+::*********************************************
+:: Test each function by calling TOOLTEST.BAT
+::*********************************************
+
+echo. 
+echo.****************************************************
+echo.       h5repack%2 %1   T E S T S            
+echo.****************************************************
+::Basic Usage:
+::1. Set flag
+::2. Call batch file tooltest.bat followed with the expected file name
+::3. Example
+::If we want to test 
+::h5repack -i ..\..\testfiles\test1.h5  -o ..\..\temptest\out.test1.h5
+::At first, we need to set the flag like
+::set flag=-i %test0% -o %output1%
+::Secondly, we call batch file tooltest.bat followed by one of reference files
+::call %tooltest% %test0% %nodiff%
+
+:: Using Filters (Zlib, SZIP)
+::1. Set flag
+::2. Call batch file tooltest.bat followed with the expected file name, zlib\szip
+::3. Example
+::If we want to test 
+::h5repack -i ..\..\testfiles\test4.h5  -o ..\..\temptest\out.test4.h5 f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10
+::At first, we need to set the flag like
+::set flag=-i %test4% -o %output4% f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10
+::Secondly, we call batch file tooltest.bat followed by one of reference files and szip
+::call %tooltest% %test4% %nodiff% szip
+::Similarly, if you are using zlib, replace "szip" with "zlib" when calling %tooltest%
+::If you are using both zlib and szip, replace "szip" with "zlib szip" when calling %tooltest%
+::The order of "zlib szip" does matter.
+
+::Skip Tests 
+::Put "skip" after the reference file, like the following
+::set flag=-i %test_scaleoffset% -o %output_scaleoffset% -f dset_none:S+O=31
+::call %tooltest% %test_scaleoffset% %nodiff% skip
+
+::--------------
+:: test0.h5
+::--------------
+set flag=-i %test0% -o %output0%
+call %tooltest% %test0% %nodiff% 
+
+::--------------
+:: test1.h5
+::--------------
+set flag=-i %test1% -o %output1%
+call %tooltest% %test1% %notcomp% 
+
+::--------------
+:: test2.h5
+::--------------
+set flag=-i %test2% -o %output2%
+call %tooltest% %test2% %notcomp%  
+
+::--------------
+:: test3.h5
+::--------------
+set flag=-i %test3% -o %output3%
+call %tooltest% %test3% %nodiff%  
+ 
+
+::--------------
+:: test4.h5
+::--------------
+set flag=-i %test4% -o %output4%
+call %tooltest% %test4% %nodiff% 
+
+::--------------
+:: test5.h5
+::--------------
+set flag=-i %test5% -o %output5%
+call %tooltest% %test5% %nodiff% 
+
+::****************************************************************
+:: use test4.h5 to write some filters  (this file has  no filters)
+::****************************************************************
+
+::--------------------------- 
+::gzip with individual object
+::---------------------------
+set flag=-i %test4% -o %output4% -f dset1:GZIP=1  -l dset1:CHUNK=20x10
+call %tooltest% %test4% %nodiff% zlib
+
+::-------------
+::gzip for all 
+::-------------
+set flag=-i %test4% -o %output4% -f GZIP=1
+call %tooltest% %test4% %nodiff% zlib
+
+::--------------------------
+::szip for individual object
+::-------------------------- 
+set flag=-i %test4% -o %output4% f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff% szip
+
+::--------------
+:: szip for all
+::--------------
+set flag=-i %test4% -o %output4% -f SZIP=8,NN
+call %tooltest% %test4% %nodiff% szip
+
+::-------------------------------
+:: shuffle with individual object
+::-------------------------------
+set flag=-i %test4% -o %output4% -f dset2:SHUF  -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff%
+
+::----------------
+:: shuffle for all
+::----------------
+set flag=-i %test4% -o %output4% -f SHUF
+call %tooltest% %test4% %nodiff%
+
+::-----------------------------------
+:: fletcher32  with individual object
+::-----------------------------------
+set flag=-i %test4% -o %output4% -f dset2:FLET  -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff%
+
+::--------------------
+:: fletcher32 for all
+::--------------------
+set flag=-i %test4% -o %output4% -f FLET
+call %tooltest% %test4% %nodiff%
+
+::------------
+::all filters
+::------------
+set flag=-i %test4% -o %output4% -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff% 
+
+:: ***********************************************************
+::  the following tests assume the input files have filters
+:: ***********************************************************
+
+::-----------
+:: szip copy
+::-----------
+set flag=-i %test_szip% -o %output_szip% 
+call %tooltest% %test_szip% %nodiff%
+
+::------------
+::szip remove
+::------------
+set flag=-i %test_szip% -o %output_szip% -f dset_szip:NONE
+call %tooltest% %test_szip% %nodiff%
+
+::--------------
+:: deflate copy
+::--------------
+set flag=-i %test_deflate% -o %output_deflate%
+call %tooltest% %test_deflate% %nodiff%
+
+::---------------
+:: deflate remove
+::---------------
+set flag=-i %test_deflate% -o %output_deflate% -f dset_deflate:NONE
+call %tooltest% %test_deflate% %nodiff%
+
+::--------------  
+:: shuffle copy
+::--------------
+set flag=-i %test_shuffle% -o %output_shuffle%
+call %tooltest% %test_shuffle% %nodiff%
+
+::----------------
+:: shuffle remove
+::----------------
+set flag=-i %test_shuffle% -o %output_shuffle% -f dset_shuffle:NONE
+call %tooltest% %test_shuffle% %nodiff%
+
+::-----------------
+:: fletcher32 copy
+::-----------------
+set flag=-i %test_fletcher32% -o %output_fletcher32%
+call %tooltest% %test_fletcher32% %nodiff%
+
+::------------------
+:: fletcher32 remove
+::------------------
+set flag=-i %test_fletcher32% -o %output_fletcher32% -f dset_fletcher32:NONE
+call %tooltest% %test_fletcher32% %nodiff%
+
+::----------
+:: nbit copy
+::----------
+set flag=-i %test_nbit% -o %output_nbit%
+call %tooltest% %test_nbit% %nodiff%
+
+::------------
+:: nbit remove
+::------------
+set flag=-i %test_nbit% -o %output_nbit% -f dset_nbit:NONE
+call %tooltest% %test_nbit% %nodiff%
+
+::---------
+:: nbit add
+::---------
+set flag=-i %test_nbit% -o %output_nbit% -f dset_int31:NBIT
+call %tooltest% %test_nbit% %nodiff%
+
+::----------------
+:: scaleoffset add
+::----------------
+set flag=-i %test_scaleoffset% -o %output_scaleoffset% -f dset_none:S+O=31
+call %tooltest% %test_scaleoffset% %nodiff% skip
+
+::-----------------
+:: scaleoffset copy
+::-----------------
+set flag=-i %test_scaleoffset% -o %output_scaleoffset%
+call %tooltest% %test_scaleoffset% %nodiff% skip
+
+::-------------------
+:: scaleoffset remove
+::-------------------
+set flag=-i %test_scaleoffset% -o %output_scaleoffset% -f dset_scaleoffset:NONE
+call %tooltest% %test_scaleoffset% %nodiff% skip 
+
+::--------------------
+:: remove all  filters
+::--------------------
+set flag=-i %test_all% -o %output_all%
+call %tooltest% %test_scaleoffset% %nodiff% skip
+
+::------------------
+::filter conversions
+::------------------
+set flag=-i %test_deflate% -o %output_deflate% -f dset_deflate:SZIP=8,NN
+call %tooltest% %test_deflate% %nodiff% zlib szip
+
+set flag=-i %test_szip% -o %output_szip% -f dset_szip:GZIP=1
+call %tooltest% %test_szip% %nodiff% zlib szip
+
+::------
+::limit
+::------
+set flag=-i %test4% -o %output4% -f GZIP=1 -m 1024
+call %tooltest% %test4% %nodiff% zlib
 
-REM testfiles\h5repacktst\%1\h5repacktst
-
-mkdir temptest
-type nul > temptest\empty.txt
-
-REM For test1.h5 and test2.h5, the output will be "Some objects are not comparable
-REM but actually there is no difference between two compared file"
-type nul > temptest\notcomparable.txt
-echo -------------------------------->>temptest\notcomparable.txt
-echo Some objects are not comparable>> temptest\notcomparable.txt
-echo -------------------------------->>temptest\notcomparable.txt
-echo Use -v for a list of objects.>> temptest\notcomparable.txt
-
-type nul > repacktest%2_%1.txt
-echo ========================================== >> repacktest%2_%1.txt
-echo Testing repacktest.bat >> repacktest%2_%1.txt
-echo ========================================== >> repacktest%2_%1.txt
-
-cd h5repack%2\%1
-
-REM
-REM The tests
-REM We use the files generated by h5repack test
-REM Each run generates "out.test*.h5" and the tool h5diff is used to
-REM compare the input and output files.  The output from tool h5diff is 
-REM redirected to a file, which should be an empty file when the input 
-REM and output files are identical.  We can check whether the h5diff output
-REM file is empty so we can know whether h5repack test passed.
-
-REM copy files (these files have no filters; test2.h5 has copied references that h5diff detects)
-REM TOOLTEST test0.h5
-h5repack%2 -i ..\..\testfiles\test0.h5 -o ..\..\temptest\out.test0.h5
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test0.h5 ..\..\temptest\out.test0.h5 > ..\..\temptest\test0.results 2>..\..\temptest\test0_error.results
-more ..\..\temptest\test0_error.results >> ..\..\temptest\test0.results
-fc ..\..\temptest\test0.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test0.h5                                              PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test0.h5                                              FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test0.h5
-del ..\..\temptest\test0.results
-del ..\..\temptest\test0_error.results
-
-REM TOOLTEST test1.h5
-h5repack%2 -i ..\..\testfiles\test1.h5 -o ..\..\temptest\out.test1.h5
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test1.h5 ..\..\temptest\out.test1.h5 > ..\..\temptest\test1.results 2>..\..\temptest\test1_error.results
-more ..\..\temptest\test1_error.results >> ..\..\temptest\test1.results
-fc ..\..\temptest\test1.results ..\..\temptest\notcomparable.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test1.h5                                              PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test1.h5                                              FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test1.h5
-del ..\..\temptest\test1.results
-del ..\..\temptest\test1_error.results
-
-REM TOOLTEST test2.h5
-h5repack%2 -i ..\..\testfiles\test2.h5 -o ..\..\temptest\out.test2.h5
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test2.h5 ..\..\temptest\out.test2.h5 > ..\..\temptest\test2.results 2>..\..\temptest\test2_error.results
-more ..\..\temptest\test2_error.results >> ..\..\temptest\test2.results
-fc ..\..\temptest\test2.results ..\..\temptest\notcomparable.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test2.h5                                              PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test2.h5                                              FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test2.h5
-del ..\..\temptest\test2.results
-del ..\..\temptest\test2_error.results
-
-REM TOOLTEST test3.h5
-h5repack%2 -i ..\..\testfiles\test3.h5 -o ..\..\temptest\out.test3.h5 
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test3.h5 ..\..\temptest\out.test3.h5 > ..\..\temptest\test3.results 2>..\..\temptest\test3_error.results
-more ..\..\temptest\test3_error.results >> ..\..\temptest\test3.results
-fc ..\..\temptest\test3.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test3.h5                                              PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test3.h5                                              FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test3.h5
-del ..\..\temptest\test3.results
-del ..\..\temptest\test3_error.results
-
-REM TOOLTEST test4.h5
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5                                              PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5                                              FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test5.h5
-h5repack%2 -i ..\..\testfiles\test5.h5 -o ..\..\temptest\out.test5.h5
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test5.h5 ..\..\temptest\out.test5.h5 > ..\..\temptest\test5.results 2>..\..\temptest\test5_error.results
-more ..\..\temptest\test5_error.results >> ..\..\temptest\test5.results
-fc ..\..\temptest\test5.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test5.h5                                              PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test5.h5                                              FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test5.h5
-del ..\..\temptest\test5.results
-del ..\..\temptest\test5_error.results
-
-REM use test4.h5 to write some filters (this file has no filters)
-REM gzip with individual object
-REM TOOLTEST test4.h5 -f dset1:GZIP=1  -l dset1:CHUNK=20x10
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP1
-if %HDF5_EXT_ZLIB%==zlib.lib (
-    h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -f dset1:GZIP=1  -l dset1:CHUNK=20x10
-    ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-    more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-    fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-    if %ERRORLEVEL%==0 (
-       echo Testing h5repack test4.h5 -f dset1:GZIP=1  -l dset1:CHUNK=20x10        PASSED >> ..\..\repacktest%2_%1.txt
-    ) else (
-        echo Testing h5repack test4.h5 -f dset1:GZIP=1  -l dset1:CHUNK=20x10        FAILED >> ..\..\repacktest%2_%1.txt
-        more temp.txt >> ..\..\repacktest%2_%1.txt
-    )
-    del temp.txt
-    del ..\..\temptest\out.test4.h5
-    del ..\..\temptest\test4.results
-    del ..\..\temptest\test4_error.results
-    GOTO NEXTSTEP2
-) else (
-    echo Testing h5repack test4.h5 -f dset1:GZIP=1  -l dset1:CHUNK=20x10        -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP2
-)
+::-----
+::file
+::-----
+set flag=-i %test4% -o %output4% -e ..\..\testfiles\h5repack_info.txt
+call %tooltest% %test4% %nodiff% zlib
 
-:NEXTSTEP1
-echo Testing h5repack test4.h5 -f dset1:GZIP=1  -l dset1:CHUNK=20x10        -SKIP- >> ..\..\repacktest%2_%1.txt
-
-:NEXTSTEP2
-
-REM gzip for all
-REM TOOLTEST test4.h5 -f GZIP=1
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP3
-if %HDF5_EXT_ZLIB%==zlib.lib (
-    h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -f GZIP=1
-    ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-    more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-    fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-    if %ERRORLEVEL%==0 (
-       echo Testing h5repack test4.h5 -f GZIP=1                                    PASSED >> ..\..\repacktest%2_%1.txt
-    ) else (
-        echo Testing h5repack test4.h5 -f GZIP=1                                    FAILED >> ..\..\repacktest%2_%1.txt
-        more temp.txt >> ..\..\repacktest%2_%1.txt
-    )
-    del temp.txt
-    del ..\..\temptest\out.test4.h5
-    del ..\..\temptest\test4.results
-    del ..\..\temptest\test4_error.results
-    GOTO NEXTSTEP4
-) else (
-    echo Testing h5repack test4.h5 -f GZIP=1                                    -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP4
-)
+echo. *********************************************
+echo layout options (these files have no filters)
+echo. *********************************************
 
-:NEXTSTEP3
-echo Testing h5repack test4.h5 -f GZIP=1                                    -SKIP- >> ..\..\repacktest%2_%1.txt
-
-:NEXTSTEP4
-
-REM szip with individual object
-REM TOOLTEST test4.h5 -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10
-if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP5
-if %HDF5_EXT_SZIP%==szlib.lib (
-   if %HDF5_SZIP_ENCODE%==1 (
-      h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10
-      ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-      more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-      fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-      if %ERRORLEVEL%==0 (
-         echo Testing h5repack test4.h5 -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10     PASSED >> ..\..\repacktest%2_%1.txt
-      ) else (
-          echo Testing h5repack test4.h5 -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10     FAILED >> ..\..\repacktest%2_%1.txt
-          more temp.txt >> ..\..\repacktest%2_%1.txt
-      )
-      del temp.txt
-      del ..\..\temptest\out.test4.h5
-      del ..\..\temptest\test4.results
-      del ..\..\temptest\test4_error.results
-      GOTO NEXTSTEP6
-      ) else (
-          echo Testing h5repack test4.h5 -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10     -SKIP- >> ..\..\repacktest%2_%1.txt
-          GOTO NEXTSTEP6
-      )
-) else (
-    echo Testing h5repack test4.h5 -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10     -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP6
-)
+set flag=-i %test4% -o %output4% -l dset2:CHUNK=20x10
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP5
-echo Testing h5repack test4.h5 -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10     -SKIP- >> ..\..\repacktest%2_%1.txt
-
-:NEXTSTEP6
-
-REM szip for all
-REM TOOLTEST test4.h5 -f SZIP=8,NN
-if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP7
-if %HDF5_EXT_SZIP%==szlib.lib (
-   if %HDF5_SZIP_ENCODE%==1 (
-      h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -f SZIP=8,NN
-      ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-      more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-      fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-      if %ERRORLEVEL%==0 (
-         echo Testing h5repack test4.h5 -f SZIP=8,NN                                 PASSED >> ..\..\repacktest%2_%1.txt
-      ) else (
-          echo Testing h5repack test4.h5 -f SZIP=8,NN                                 FAILED >> ..\..\repacktest%2_%1.txt
-          more temp.txt >> ..\..\repacktest%2_%1.txt
-      )
-      del temp.txt
-      del ..\..\temptest\out.test4.h5
-      del ..\..\temptest\test4.results
-      del ..\..\temptest\test4_error.results
-      GOTO NEXTSTEP8
-      ) else (
-          echo Testing h5repack test4.h5 -f SZIP=8,NN                                 -SKIP- >> ..\..\repacktest%2_%1.txt
-          GOTO NEXTSTEP8
-      )
-) else (
-    echo Testing h5repack test4.h5 -f SZIP=8,NN                                 -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP8
-)
+set flag=-i %test4% -o %output4% -l CHUNK=20x10
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP7
-echo Testing h5repack test4.h5 -f SZIP=8,NN                                 -SKIP- >> ..\..\repacktest%2_%1.txt
+set flag=-i %test4% -o %output4% -l dset2:CONTI
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP8
+set flag=-i %test4% -o %output4% -l CONTI
+call %tooltest% %test4% %nodiff%
 
-REM shuffle with individual object
-REM TOOLTEST test4.h5 -f dset2:SHUF  -l dset2:CHUNK=20x10
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -f dset2:SHUF  -l dset2:CHUNK=20x10
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -f dset2:SHUF  -l dset2:CHUNK=20x10          PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -f dset2:SHUF  -l dset2:CHUNK=20x10          FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM shuffle for all
-REM TOOLTEST test4.h5 -f SHUF
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -f SHUF
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -f SHUF                                      PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -f SHUF                                      FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM fletcher32  with individual object
-REM TOOLTEST test4.h5 -f dset2:FLET  -l dset2:CHUNK=20x10
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -f dset2:FLET  -l dset2:CHUNK=20x10
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -f dset2:FLET  -l dset2:CHUNK=20x10          PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -f dset2:FLET  -l dset2:CHUNK=20x10          FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM fletcher32 for all
-REM TOOLTEST test4.h5 -f FLET
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -f FLET
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -f FLET                                      PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -f FLET                                      FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM all filters
-REM TOOLTEST test4.h5 -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP9
-if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP9
-if %HDF5_EXT_ZLIB%==zlib.lib (
-   if %HDF5_EXT_SZIP%==szlib.lib (
-      if %HDF5_SZIP_ENCODE%==1 (
-         h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10
-         ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-         more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-         fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-         if %ERRORLEVEL%==0 (
-            echo Testing h5repack test4.h5 -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8, PASSED >> ..\..\repacktest%2_%1.txt
-         ) else (
-             echo Testing h5repack test4.h5 -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8, FAILED >> ..\..\repacktest%2_%1.txt
-             more temp.txt >> ..\..\repacktest%2_%1.txt
-         )
-         del temp.txt
-         del ..\..\temptest\out.test4.h5
-         del ..\..\temptest\test4.results
-         del ..\..\temptest\test4_error.results
-         GOTO NEXTSTEP10
-         ) else (
-             echo Testing h5repack test4.h5 -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8, -SKIP- >> ..\..\repacktest%2_%1.txt
-             GOTO NEXTSTEP10
-         )
-      ) else (
-          echo Testing h5repack test4.h5 -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8, -SKIP- >> ..\..\repacktest%2_%1.txt
-          GOTO NEXTSTEP10
-      )
-) else (
-    echo Testing h5repack test4.h5 -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8, -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP10
-)
+set flag=-i %test4% -o %output4% -l dset2:COMPA
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP9
-echo Testing h5repack test4.h5 -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8, -SKIP- >> ..\..\repacktest%2_%1.txt
-
-:NEXTSTEP10
-
-REM ###########################################################
-REM # the following tests assume the input files have filters
-REM ###########################################################
-
-REM szip copy
-REM TOOLTEST test_szip.h5
-if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP11
-if %HDF5_EXT_SZIP%==szlib.lib (
-   if %HDF5_SZIP_ENCODE%==1 (
-      h5repack%2 -i ..\..\testfiles\test_szip.h5 -o ..\..\temptest\out.test_szip.h5
-      ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_szip.h5 ..\..\temptest\out.test_szip.h5 > ..\..\temptest\test_szip.results 2>..\..\temptest\test_szip_error.results
-      more ..\..\temptest\test_szip_error.results >> ..\..\temptest\test_szip.results
-      fc ..\..\temptest\test_szip.results ..\..\temptest\empty.txt >temp.txt
-      if %ERRORLEVEL%==0 (
-         echo Testing h5repack test_szip.h5                                          PASSED >> ..\..\repacktest%2_%1.txt
-      ) else (
-         echo Testing h5repack test_szip.h5                                          FAILED >> ..\..\repacktest%2_%1.txt
-         more temp.txt >> ..\..\repacktest%2_%1.txt
-      )
-      del temp.txt
-      del ..\..\temptest\out.test_szip.h5
-      del ..\..\temptest\test_szip.results
-      del ..\..\temptest\test_szip_error.results
-      GOTO NEXTSTEP12
-      ) else (
-          echo Testing h5repack test_szip.h5                                          -SKIP- >> ..\..\repacktest%2_%1.txt
-          GOTO NEXTSTEP12
-      )
-) else (
-    echo Testing h5repack test_szip.h5                                          -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP12
-)
+set flag=-i %test4% -o %output4% -l COMPA
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP11
-echo Testing h5repack test_szip.h5                                          -SKIP- >> ..\..\repacktest%2_%1.txt
+echo. *****************************************
+echo layout conversions (file has no filters)
+echo. *****************************************
 
-:NEXTSTEP12
-  
-REM szip remove
-REM TOOLTEST test_szip.h5 -f dset_szip:NONE
-if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP13
-if %HDF5_EXT_SZIP%==szlib.lib (
-   if %HDF5_SZIP_ENCODE%==1 (
-      h5repack%2 -i ..\..\testfiles\test_szip.h5 -o ..\..\temptest\out.test_szip.h5 -f dset_szip:NONE
-      ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_szip.h5 ..\..\temptest\out.test_szip.h5 > ..\..\temptest\test_szip.results 2>..\..\temptest\test_szip_error.results
-      more ..\..\temptest\test_szip_error.results >> ..\..\temptest\test_szip.results
-      fc ..\..\temptest\test_szip.results ..\..\temptest\empty.txt >temp.txt
-      if %ERRORLEVEL%==0 (
-         echo Testing h5repack test_szip.h5 -f dset_szip:NONE                        PASSED >> ..\..\repacktest%2_%1.txt
-      ) else (
-         echo Testing h5repack test_szip.h5 -f dset_szip:NONE                        FAILED >> ..\..\repacktest%2_%1.txt
-         more temp.txt >> ..\..\repacktest%2_%1.txt
-      )
-      del temp.txt
-      del ..\..\temptest\out.test_szip.h5
-      del ..\..\temptest\test_szip.results
-      del ..\..\temptest\test_szip_error.results
-      GOTO NEXTSTEP14
-      ) else (
-          echo Testing h5repack test_szip.h5 -f dset_szip:NONE                        -SKIP- >> ..\..\repacktest%2_%1.txt
-          GOTO NEXTSTEP14
-      )
-) else (
-    echo Testing h5repack test_szip.h5 -f dset_szip:NONE                        -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP14
-)
+set flag=-i %test4% -o %output4% -l dset_compact:CONTI
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP13
-echo Testing h5repack test_szip.h5 -f dset_szip:NONE                        -SKIP- >> ..\..\repacktest%2_%1.txt
+set flag=-i %test4% -o %output4% -l dset_compact:CHUNK=2x5
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP14
-  
-REM deflate copy
-REM TOOLTEST test_deflate.h5
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP15
-if %HDF5_EXT_ZLIB%==zlib.lib (
-   h5repack%2 -i ..\..\testfiles\test_deflate.h5 -o ..\..\temptest\out.test_deflate.h5
-   ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_deflate.h5 ..\..\temptest\out.test_deflate.h5 > ..\..\temptest\test_deflate.results 2>..\..\temptest\test_deflate_error.results
-   more ..\..\temptest\test_deflate_error.results >> ..\..\temptest\test_deflate.results
-   fc ..\..\temptest\test_deflate.results ..\..\temptest\empty.txt >temp.txt
-   if %ERRORLEVEL%==0 (
-      echo Testing h5repack test_deflate.h5                                       PASSED >> ..\..\repacktest%2_%1.txt
-   ) else (
-      echo Testing h5repack test_deflate.h5                                       FAILED >> ..\..\repacktest%2_%1.txt
-      more temp.txt >> ..\..\repacktest%2_%1.txt
-   )
-   del temp.txt
-   del ..\..\temptest\out.test_deflate.h5
-   del ..\..\temptest\test_deflate.results
-   del ..\..\temptest\test_deflate_error.results
-   GOTO NEXTSTEP16
-) else (
-    echo Testing h5repack test_deflate.h5                                       -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP16
-)
+set flag=-i %test4% -o %output4% -l dset_compact:COMPA
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP15
-echo Testing h5repack test_deflate.h5                                       -SKIP- >> ..\..\repacktest%2_%1.txt
-
-:NEXTSTEP16
-
-REM deflate remove
-REM TOOLTEST test_deflate.h5 -f dset_deflate:NONE
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP17
-if %HDF5_EXT_ZLIB%==zlib.lib (
-   h5repack%2 -i ..\..\testfiles\test_deflate.h5 -o ..\..\temptest\out.test_deflate.h5 -f dset_deflate:NONE
-   ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_deflate.h5 ..\..\temptest\out.test_deflate.h5 > ..\..\temptest\test_deflate.results 2>..\..\temptest\test_deflate_error.results
-   more ..\..\temptest\test_deflate_error.results >> ..\..\temptest\test_deflate.results
-   fc ..\..\temptest\test_deflate.results ..\..\temptest\empty.txt >temp.txt
-   if %ERRORLEVEL%==0 (
-      echo Testing h5repack test_deflate.h5 -f dset_deflate:NONE                  PASSED >> ..\..\repacktest%2_%1.txt
-   ) else (
-      echo Testing h5repack test_deflate.h5 -f dset_deflate:NONE                  FAILED >> ..\..\repacktest%2_%1.txt
-      more temp.txt >> ..\..\repacktest%2_%1.txt
-   )
-   del temp.txt
-   del ..\..\temptest\out.test_deflate.h5
-   del ..\..\temptest\test_deflate.results
-   del ..\..\temptest\test_deflate_error.results
-   GOTO NEXTSTEP18
-) else (
-    echo Testing h5repack test_deflate.h5 -f dset_deflate:NONE                  -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP18
-)
+set flag=-i %test4% -o %output4% -l dset_contiguous:COMPA
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP17
-echo Testing h5repack test_deflate.h5 -f dset_deflate:NONE                  -SKIP- >> ..\..\repacktest%2_%1.txt
+set flag=-i %test4% -o %output4% -l dset_contiguous:CHUNK=3x6
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP18
-   
-REM shuffle copy
-REM TOOLTEST test_shuffle.h5
-h5repack%2 -i ..\..\testfiles\test_shuffle.h5 -o ..\..\temptest\out.test_shuffle.h5
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_shuffle.h5 ..\..\temptest\out.test_shuffle.h5 > ..\..\temptest\test_shuffle.results 2>..\..\temptest\test_shuffle_error.results
-more ..\..\temptest\test_shuffle_error.results >> ..\..\temptest\test_shuffle.results
-fc ..\..\temptest\test_shuffle.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test_shuffle.h5                                       PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test_shuffle.h5                                       FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test_shuffle.h5
-del ..\..\temptest\test_shuffle.results
-del ..\..\temptest\test_shuffle_error.results
-
-REM shuffle remove
-REM TOOLTEST test_shuffle.h5 -f dset_shuffle:NONE
-h5repack%2 -i ..\..\testfiles\test_shuffle.h5 -o ..\..\temptest\out.test_shuffle.h5 -f dset_shuffle:NONE
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_shuffle.h5 ..\..\temptest\out.test_shuffle.h5 > ..\..\temptest\test_shuffle.results 2>..\..\temptest\test_shuffle_error.results
-more ..\..\temptest\test_shuffle_error.results >> ..\..\temptest\test_shuffle.results
-fc ..\..\temptest\test_shuffle.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test_shuffle.h5 -f dset_shuffle:NONE                  PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test_shuffle.h5 -f dset_shuffle:NONE                  FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test_shuffle.h5
-del ..\..\temptest\test_shuffle.results
-del ..\..\temptest\test_shuffle_error.results
-
-REM fletcher32 copy
-REM TOOLTEST test_fletcher32.h5
-h5repack%2 -i ..\..\testfiles\test_fletcher32.h5 -o ..\..\temptest\out.test_fletcher32.h5
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_fletcher32.h5 ..\..\temptest\out.test_fletcher32.h5 > ..\..\temptest\test_fletcher32.results 2>..\..\temptest\test_fletcher32_error.results
-more ..\..\temptest\test_fletcher32_error.results >> ..\..\temptest\test_fletcher32.results
-fc ..\..\temptest\test_fletcher32.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test_fletcher32.h5                                    PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test_fletcher32.h5                                    FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test_fletcher32.h5
-del ..\..\temptest\test_fletcher32.results
-del ..\..\temptest\test_fletcher32_error.results
-
-REM fletcher32 remove
-REM TOOLTEST test_fletcher32.h5 -f dset_fletcher32:NONE
-h5repack%2 -i ..\..\testfiles\test_fletcher32.h5 -o ..\..\temptest\out.test_fletcher32.h5 -f dset_fletcher32:NONE
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_fletcher32.h5 ..\..\temptest\out.test_fletcher32.h5 > ..\..\temptest\test_fletcher32.results 2>..\..\temptest\test_fletcher32_error.results
-more ..\..\temptest\test_fletcher32_error.results >> ..\..\temptest\test_fletcher32.results
-fc ..\..\temptest\test_fletcher32.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test_fletcher32.h5 -f dset_fletcher32:NONE            PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test_fletcher32.h5 -f dset_fletcher32:NONE            FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test_fletcher32.h5
-del ..\..\temptest\test_fletcher32.results
-del ..\..\temptest\test_fletcher32_error.results
-
-REM remove all  filters
-REM TOOLTEST test_all.h5 -f NONE
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP19
-if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP19
-if %HDF5_EXT_ZLIB%==zlib.lib (
-   if %HDF5_EXT_SZIP%==szlib.lib (
-      if %HDF5_SZIP_ENCODE%==1 (
-         h5repack%2 -i ..\..\testfiles\test_all.h5 -o ..\..\temptest\out.test_all.h5 -f NONE
-         ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_all.h5 ..\..\temptest\out.test_all.h5 > ..\..\temptest\test_all.results 2>..\..\temptest\test_all_error.results
-         more ..\..\temptest\test_all_error.results >> ..\..\temptest\test_all.results
-         fc ..\..\temptest\test_all.results ..\..\temptest\empty.txt >temp.txt
-         if %ERRORLEVEL%==0 (
-            echo Testing h5repack test_all.h5 -f NONE                                   PASSED >> ..\..\repacktest%2_%1.txt
-         ) else (
-            echo Testing h5repack test_all.h5 -f NONE                                   FAILED >> ..\..\repacktest%2_%1.txt
-            more temp.txt >> ..\..\repacktest%2_%1.txt
-         )
-         del temp.txt
-         del ..\..\temptest\out.test_all.h5
-         del ..\..\temptest\test_all.results
-         del ..\..\temptest\test_all_error.results
-         GOTO NEXTSTEP20
-         ) else (
-             echo Testing h5repack test_all.h5 -f NONE                                   -SKIP- >> ..\..\repacktest%2_%1.txt
-             GOTO NEXTSTEP20
-         )
-      ) else (
-          echo Testing h5repack test_all.h5 -f NONE                                   -SKIP- >> ..\..\repacktest%2_%1.txt
-          GOTO NEXTSTEP20
-      )
-) else (
-    echo Testing h5repack test_all.h5 -f NONE                                   -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP20
-)
+set flag=-i %test4% -o %output4% -l dset_contiguous:CONTI
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP19
-echo Testing h5repack test_all.h5 -f NONE                                   -SKIP- >> ..\..\repacktest%2_%1.txt
-
-:NEXTSTEP20
-
-REM filter conversions
-REM TOOLTEST test_deflate.h5 -f dset_deflate:SZIP=8,NN
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP21
-if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP21
-if %HDF5_EXT_ZLIB%==zlib.lib (
-   if %HDF5_EXT_SZIP%==szlib.lib (
-      if %HDF5_SZIP_ENCODE%==1 (
-         h5repack%2 -i ..\..\testfiles\test_deflate.h5 -o ..\..\temptest\out.test_deflate.h5 -f dset_deflate:SZIP=8,NN
-         ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_deflate.h5 ..\..\temptest\out.test_deflate.h5 > ..\..\temptest\test_deflate.results 2>..\..\temptest\test_deflate_error.results
-         more ..\..\temptest\test_deflate_error.results >> ..\..\temptest\test_deflate.results
-         fc ..\..\temptest\test_deflate.results ..\..\temptest\empty.txt >temp.txt
-         if %ERRORLEVEL%==0 (
-            echo Testing h5repack test_deflate.h5 -f dset_deflate:SZIP=8,NN             PASSED >> ..\..\repacktest%2_%1.txt
-         ) else (
-            echo Testing h5repack test_deflate.h5 -f dset_deflate:SZIP=8,NN             FAILED >> ..\..\repacktest%2_%1.txt
-            more temp.txt >> ..\..\repacktest%2_%1.txt
-         )
-         del temp.txt
-         del ..\..\temptest\out.test_deflate.h5
-         del ..\..\temptest\test_deflate.results
-         del ..\..\temptest\test_deflate_error.results
-         GOTO NEXTSTEP22
-      ) else (
-         echo Testing h5repack test_deflate.h5 -f dset_deflate:SZIP=8,NN             -SKIP- >> ..\..\repacktest%2_%1.txt
-         GOTO NEXTSTEP22
-      )
-   ) else (
-      echo Testing h5repack test_deflate.h5 -f dset_deflate:SZIP=8,NN             -SKIP- >> ..\..\repacktest%2_%1.txt
-      GOTO NEXTSTEP22
-   )
-) else (
-    echo Testing h5repack test_deflate.h5 -f dset_deflate:SZIP=8,NN             -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP22
-)
+set flag=-i %test4% -o %output4% -l dset_chunk:COMPA
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP21
-echo Testing h5repack test_deflate.h5 -f dset_deflate:SZIP=8,NN             -SKIP- >> ..\..\repacktest%2_%1.txt
+set flag=-i %test4% -o %output4% -l dset_chunk:CHUNK=18x13
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP22
-  
-REM TOOLTEST test_szip.h5 -f dset_szip:GZIP=1
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP23
-if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP23
-if %HDF5_EXT_ZLIB%==zlib.lib (
-   if %HDF5_EXT_SZIP%==szlib.lib (
-      if %HDF5_SZIP_ENCODE%==1 (
-         h5repack%2 -i ..\..\testfiles\test_szip.h5 -o ..\..\temptest\out.test_szip.h5 -f dset_szip:GZIP=1
-         ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test_szip.h5 ..\..\temptest\out.test_szip.h5 > ..\..\temptest\test_szip.results 2>..\..\temptest\test_szip_error.results
-         more ..\..\temptest\test_szip_error.results >> ..\..\temptest\test_szip.results
-         fc ..\..\temptest\test_szip.results ..\..\temptest\empty.txt >temp.txt
-         if %ERRORLEVEL%==0 (
-            echo Testing h5repack test_szip.h5 -f dset_szip:GZIP=1                      PASSED >> ..\..\repacktest%2_%1.txt
-         ) else (
-            echo Testing h5repack test_szip.h5 -f dset_szip:GZIP=1                      FAILED >> ..\..\repacktest%2_%1.txt
-            more temp.txt >> ..\..\repacktest%2_%1.txt
-         )
-         del temp.txt
-         del ..\..\temptest\out.test_szip.h5
-         del ..\..\temptest\test_szip.results
-         del ..\..\temptest\test_szip_error.results
-         GOTO NEXTSTEP24
-      ) else (
-         echo Testing h5repack test_szip.h5 -f dset_szip:GZIP=1                      -SKIP- >> ..\..\repacktest%2_%1.txt
-         GOTO NEXTSTEP24
-      )
-   ) else (
-      echo Testing h5repack test_szip.h5 -f dset_szip:GZIP=1                      -SKIP- >> ..\..\repacktest%2_%1.txt
-      GOTO NEXTSTEP24
-   )
-) else (
-    echo Testing h5repack test_szip.h5 -f dset_szip:GZIP=1                      -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP24
-)
+set flag=-i %test4% -o %output4% -l dset_chunk:CONTI
+call %tooltest% %test4% %nodiff%
 
-:NEXTSTEP23
-echo Testing h5repack test_szip.h5 -f dset_szip:GZIP=1                      -SKIP- >> ..\..\repacktest%2_%1.txt
+cd ..\..
 
-:NEXTSTEP24
-  
-REM limit
-REM TOOLTEST test4.h5 -f GZIP=1 -m 1024
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP25
-if %HDF5_EXT_ZLIB%==zlib.lib (
-   h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -f GZIP=1 -m 1024
-   ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-   more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-   fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-   if %ERRORLEVEL%==0 (
-      echo Testing h5repack test4.h5 -f GZIP=1 -m 1024                            PASSED >> ..\..\repacktest%2_%1.txt
-   ) else (
-      echo Testing h5repack test4.h5 -f GZIP=1 -m 1024                            FAILED >> ..\..\repacktest%2_%1.txt
-      more temp.txt >> ..\..\repacktest%2_%1.txt
-   )
-   del temp.txt
-   del ..\..\temptest\out.test4.h5
-   del ..\..\temptest\test4.results
-   del ..\..\temptest\test4_error.results
-   GOTO NEXTSTEP26
+echo.
+::Tests how many tests failed and how many tests skiped
+if %totalerr%==0 (
+echo. All of the %exefile% %p1% Tests Passed!
+echo. All of the %exefile% %p1% Tests Passed! >> %tempResults%
 ) else (
-    echo Testing h5repack test4.h5 -f GZIP=1 -m 1024                            -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP26
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!  
+echo. %exefile% %p1% Tests Finished with %totalerr% Errors!>> %tempResults%
 )
 
-:NEXTSTEP25
-echo Testing h5repack test4.h5 -f GZIP=1 -m 1024                            -SKIP- >> ..\..\repacktest%2_%1.txt
-
-:NEXTSTEP26
-    
-REM file
-REM TOOLTEST test4.h5 -e ../testfiles/h5repack_info.txt
-if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP27
-if %HDF5_EXT_ZLIB%==zlib.lib (
-   h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -e ..\..\testfiles\h5repack_info.txt
-   ..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-   more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-   fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-   if %ERRORLEVEL%==0 (
-      echo Testing h5repack test4.h5 -e ../testfiles/h5repack_info.txt            PASSED >> ..\..\repacktest%2_%1.txt
-   ) else (
-      echo Testing h5repack test4.h5 -e ../testfiles/h5repack_info.txt            FAILED >> ..\..\repacktest%2_%1.txt
-      more temp.txt >> ..\..\repacktest%2_%1.txt
-   )
-   del temp.txt
-   del ..\..\temptest\out.test4.h5
-   del ..\..\temptest\test4.results
-   del ..\..\temptest\test4_error.results
-   GOTO NEXTSTEP28
-) else (
-    echo Testing h5repack test4.h5 -e ../testfiles/h5repack_info.txt            -SKIP- >> ..\..\repacktest%2_%1.txt
-    GOTO NEXTSTEP28
+if not %totalskip%==0 (
+echo. %totalskip% Tests in total Skiped!  >> %tempResults%
+echo. %totalskip% Tests in total Skiped!
+echo. 
+find "SKIPED" %tempResults% | more +2
 )
 
-:NEXTSTEP27
-echo Testing h5repack test4.h5 -e ../testfiles/h5repack_info.txt            -SKIP- >> ..\..\repacktest%2_%1.txt
+:: remove direcotory temptest and all its contents
+rmdir /s/q temptest
 
-:NEXTSTEP28
-   
-REM layout chunk
-REM TOOLTEST test4.h5 -l dset2:CHUNK=20x10
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset2:CHUNK=20x10
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset2:CHUNK=20x10                         PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset2:CHUNK=20x10                         FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l CHUNK=20x10
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l CHUNK=20x10
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l CHUNK=20x10                               PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l CHUNK=20x10                               FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM layout contiguous
-REM TOOLTEST test4.h5 -l dset2:CONTI
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset2:CONTI
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset2:CONTI                               PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset2:CONTI                               FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l CONTI
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l CONTI
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l CONTI                                     PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l CONTI                                     FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM layout compact
-REM TOOLTEST test4.h5 -l dset2:COMPA
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset2:COMPA
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset2:COMPA                               PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset2:COMPA                               FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l COMPA
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l COMPA
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l COMPA                                     PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l COMPA                                     FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM conversions
-REM TOOLTEST test4.h5 -l dset_compact:CONTI
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset_compact:CONTI
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset_compact:CONTI                        PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset_compact:CONTI                        FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l dset_compact:CHUNK=2x5
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset_compact:CHUNK=2x5
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset_compact:CHUNK=2x5                    PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset_compact:CHUNK=2x5                    FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l dset_compact:COMPA
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset_compact:COMPA
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset_compact:COMPA                        PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset_compact:COMPA                        FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l dset_contiguous:COMPA
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset_contiguous:COMPA
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset_contiguous:COMPA                     PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset_contiguous:COMPA                     FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l dset_contiguous:CHUNK=3x6
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset_contiguous:CHUNK=3x6
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset_contiguous:CHUNK=3x6                 PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset_contiguous:CHUNK=3x6                 FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l dset_contiguous:CONTI
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset_contiguous:CONTI
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset_contiguous:CONTI                     PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset_contiguous:CONTI                     FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l dset_chunk:COMPA
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset_chunk:COMPA
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset_chunk:COMPA                          PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset_chunk:COMPA                          FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l dset_chunk:CONTI
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset_chunk:CONTI
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset_chunk:CONTI                          PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset_chunk:CONTI                          FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
-)
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
-
-REM TOOLTEST test4.h5 -l dset_chunk:CHUNK=18x13
-h5repack%2 -i ..\..\testfiles\test4.h5 -o ..\..\temptest\out.test4.h5 -l dset_chunk:CHUNK=18x13
-..\..\h5diff%2\%1\h5diff%2 ..\..\testfiles\test4.h5 ..\..\temptest\out.test4.h5 > ..\..\temptest\test4.results 2>..\..\temptest\test4_error.results
-more ..\..\temptest\test4_error.results >> ..\..\temptest\test4.results
-fc ..\..\temptest\test4.results ..\..\temptest\empty.txt >temp.txt
-if %ERRORLEVEL%==0 (
-   echo Testing h5repack test4.h5 -l dset_chunk:CHUNK=18x13                    PASSED >> ..\..\repacktest%2_%1.txt
-) else (
-   echo Testing h5repack test4.h5 -l dset_chunk:CHUNK=18x13                    FAILED >> ..\..\repacktest%2_%1.txt
-   more temp.txt >> ..\..\repacktest%2_%1.txt
+:: Clean environment variables
+
+for %%v in (p1 p2 tempResults exefile tooltest nodiff notcomp totalerr totalskip) do set %%v=
+for %%v in (0 1 2 3 4 5 _szip _deflate _shuffle _fletcher32 _nbit _scaleoffset _all) do (
+set test%%v=
+set output%%v=
 )
-del temp.txt
-del ..\..\temptest\out.test4.h5
-del ..\..\temptest\test4.results
-del ..\..\temptest\test4_error.results
 
-cd ..
-cd ..
 
-rmdir /s/q temptest
\ No newline at end of file