[svn-r10355] Purpose:

For windows support, remove all.zip from hdf5.
Description:
Add Batch files for tools test.
Solution:

Platforms tested:

Misc. update:

8 files changed, 5324 insertions, 0 deletions

diff --git a/windows/tools/deleteline.bat b/windows/tools/deleteline.bat
new file mode 100755
index 0000000..461cfde
--- /dev/null
+++ b/windows/tools/deleteline.bat
@@ -0,0 +1,3 @@
+@echo off
+type nul > ..\temptest\fctemp\%1
+more /e +%2 %1 > ..\temptest\fctemp\%1
diff --git a/windows/tools/difftest.BAT b/windows/tools/difftest.BAT
new file mode 100755
index 0000000..3ae88ef
--- /dev/null
+++ b/windows/tools/difftest.BAT
@@ -0,0 +1,1134 @@
+@ ECHO OFF
+
+mkdir temptest
+cd h5diff%2\%1
+h5diff%2 -h > ..\..\temptest\h5diff_10.results 2>..\..\temptest\h5diff_10_error.results
+more ..\..\temptest\h5diff_10_error.results >> ..\..\temptest\h5diff_10.results
+del ..\..\temptest\h5diff_10_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 > ..\..\temptest\h5diff_11.results 2>..\..\temptest\h5diff_11_error.results
+more ..\..\temptest\h5diff_11_error.results >> ..\..\temptest\h5diff_11.results
+del ..\..\temptest\h5diff_11_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 g1/dset1 g1/dset2 > ..\..\temptest\h5diff_12.results 2>..\..\temptest\h5diff_12_error.results
+more ..\..\temptest\h5diff_12_error.results >> ..\..\temptest\h5diff_12.results
+del ..\..\temptest\h5diff_12_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -r > ..\..\temptest\h5diff_13.results 2>..\..\temptest\h5diff_13_error.results
+more ..\..\temptest\h5diff_13_error.results >> ..\..\temptest\h5diff_13.results
+del ..\..\temptest\h5diff_13_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -r g1/dset1 g1/dset2 > ..\..\temptest\h5diff_14.results 2>..\..\temptest\h5diff_14_error.results
+more ..\..\temptest\h5diff_14_error.results >> ..\..\temptest\h5diff_14.results
+del ..\..\temptest\h5diff_14_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -r -d 5 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_15.results 2>..\..\temptest\h5diff_15_error.results
+more ..\..\temptest\h5diff_15_error.results >> ..\..\temptest\h5diff_15.results
+del ..\..\temptest\h5diff_15_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -r -p 0.05 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_16.results 2>..\..\temptest\h5diff_16_error.results
+more ..\..\temptest\h5diff_16_error.results >> ..\..\temptest\h5diff_16.results
+del ..\..\temptest\h5diff_16_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -v > ..\..\temptest\h5diff_17.results 2>..\..\temptest\h5diff_17_error.results
+more ..\..\temptest\h5diff_17_error.results >> ..\..\temptest\h5diff_17.results
+del ..\..\temptest\h5diff_17_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -q > ..\..\temptest\h5diff_18.results 2>..\..\temptest\h5diff_18_error.results
+more ..\..\temptest\h5diff_18_error.results >> ..\..\temptest\h5diff_18.results
+del ..\..\temptest\h5diff_18_error.results
+
+h5diff%2 ..\..\testfiles\file3.h5 ..\..\testfiles\file3.h5 -v dset group > ..\..\temptest\h5diff_20.results 2>..\..\temptest\h5diff_20_error.results
+more ..\..\temptest\h5diff_20_error.results >> ..\..\temptest\h5diff_20.results
+del ..\..\temptest\h5diff_20_error.results
+
+h5diff%2 ..\..\testfiles\file3.h5 ..\..\testfiles\file3.h5 -v dset link > ..\..\temptest\h5diff_21.results 2>..\..\temptest\h5diff_21_error.results
+more ..\..\temptest\h5diff_21_error.results >> ..\..\temptest\h5diff_21.results
+del ..\..\temptest\h5diff_21_error.results
+
+h5diff%2 ..\..\testfiles\file3.h5 ..\..\testfiles\file3.h5 -v dset type > ..\..\temptest\h5diff_22.results 2>..\..\temptest\h5diff_22_error.results
+more ..\..\temptest\h5diff_22_error.results >> ..\..\temptest\h5diff_22.results
+del ..\..\temptest\h5diff_22_error.results
+
+h5diff%2 ..\..\testfiles\file3.h5 ..\..\testfiles\file3.h5 -v group group > ..\..\temptest\h5diff_23.results 2>..\..\temptest\h5diff_23_error.results
+more ..\..\temptest\h5diff_23_error.results >> ..\..\temptest\h5diff_23.results
+del ..\..\temptest\h5diff_23_error.results
+
+h5diff%2 ..\..\testfiles\file3.h5 ..\..\testfiles\file3.h5 -v type type > ..\..\temptest\h5diff_24.results 2>..\..\temptest\h5diff_24_error.results
+more ..\..\temptest\h5diff_24_error.results >> ..\..\temptest\h5diff_24.results
+del ..\..\temptest\h5diff_24_error.results
+
+h5diff%2 ..\..\testfiles\file3.h5 ..\..\testfiles\file3.h5 -v link link > ..\..\temptest\h5diff_25.results 2>..\..\temptest\h5diff_25_error.results
+more ..\..\temptest\h5diff_25_error.results >> ..\..\temptest\h5diff_25.results
+del ..\..\temptest\h5diff_25_error.results
+
+
+h5diff%2 ..\..\testfiles\file4.h5 ..\..\testfiles\file4.h5 -v dset0a dset0b > ..\..\temptest\h5diff_50.results 2>..\..\temptest\h5diff_50_error.results
+more ..\..\temptest\h5diff_50_error.results >> ..\..\temptest\h5diff_50.results
+del ..\..\temptest\h5diff_50_error.results
+
+h5diff%2 ..\..\testfiles\file4.h5 ..\..\testfiles\file4.h5 -v dset1a dset1b > ..\..\temptest\h5diff_51.results 2>..\..\temptest\h5diff_51_error.results
+more ..\..\temptest\h5diff_51_error.results >> ..\..\temptest\h5diff_51.results
+del ..\..\temptest\h5diff_51_error.results
+
+h5diff%2 ..\..\testfiles\file4.h5 ..\..\testfiles\file4.h5 -v dset2a dset2b > ..\..\temptest\h5diff_52.results 2>..\..\temptest\h5diff_52_error.results
+more ..\..\temptest\h5diff_52_error.results >> ..\..\temptest\h5diff_52.results
+del ..\..\temptest\h5diff_52_error.results
+
+h5diff%2 ..\..\testfiles\file4.h5 ..\..\testfiles\file4.h5 -v dset3a dset4b > ..\..\temptest\h5diff_53.results 2>..\..\temptest\h5diff_53_error.results
+more ..\..\temptest\h5diff_53_error.results >> ..\..\temptest\h5diff_53.results
+del ..\..\temptest\h5diff_53_error.results
+
+h5diff%2 ..\..\testfiles\file4.h5 ..\..\testfiles\file4.h5 -v dset4a dset4b > ..\..\temptest\h5diff_54.results 2>..\..\temptest\h5diff_54_error.results
+more ..\..\temptest\h5diff_54_error.results >> ..\..\temptest\h5diff_54.results
+del ..\..\temptest\h5diff_54_error.results
+
+h5diff%2 ..\..\testfiles\file4.h5 ..\..\testfiles\file4.h5 -v dset5a dset5b > ..\..\temptest\h5diff_55.results 2>..\..\temptest\h5diff_55_error.results
+more ..\..\temptest\h5diff_55_error.results >> ..\..\temptest\h5diff_55.results
+del ..\..\temptest\h5diff_55_error.results
+
+h5diff%2 ..\..\testfiles\file4.h5 ..\..\testfiles\file4.h5 -v dset6a dset6b > ..\..\temptest\h5diff_56.results 2>..\..\temptest\h5diff_56_error.results
+more ..\..\temptest\h5diff_56_error.results >> ..\..\temptest\h5diff_56.results
+del ..\..\temptest\h5diff_56_error.results
+
+h5diff%2 ..\..\testfiles\file4.h5 ..\..\testfiles\file4.h5 -v dset7a dset7b > ..\..\temptest\h5diff_57.results 2>..\..\temptest\h5diff_57_error.results
+more ..\..\temptest\h5diff_57_error.results >> ..\..\temptest\h5diff_57.results
+del ..\..\temptest\h5diff_57_error.results
+
+REM h5diff%2 ..\..\testfiles\file4.h5 ..\..\testfiles\file4.h5 dset8a dset8b > ..\..\temptest\h5diff_58.results 2>..\..\temptest\h5diff_58_error.results
+REM more ..\..\temptest\h5diff_58_error.results >> ..\..\temptest\h5diff_58.results
+REM del ..\..\temptest\h5diff_58_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 > ..\..\temptest\h5diff_600.results 2>..\..\temptest\h5diff_600_error.results
+more ..\..\temptest\h5diff_600_error.results >> ..\..\temptest\h5diff_600.results
+del ..\..\temptest\h5diff_600_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -x > ..\..\temptest\h5diff_601.results 2>..\..\temptest\h5diff_601_error.results
+more ..\..\temptest\h5diff_601_error.results >> ..\..\temptest\h5diff_601.results
+del ..\..\temptest\h5diff_601_error.results
+
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -d g1/dset3 g1/dset4 > ..\..\temptest\h5diff_602.results 2>..\..\temptest\h5diff_602_error.results
+more ..\..\temptest\h5diff_602_error.results >> ..\..\temptest\h5diff_602.results
+del ..\..\temptest\h5diff_602_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -d -4 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_603.results 2>..\..\temptest\h5diff_603_error.results
+more ..\..\temptest\h5diff_603_error.results >> ..\..\temptest\h5diff_603.results
+del ..\..\temptest\h5diff_603_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -d 0 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_604.results 2>..\..\temptest\h5diff_604_error.results
+more ..\..\temptest\h5diff_604_error.results >> ..\..\temptest\h5diff_604.results
+del ..\..\temptest\h5diff_604_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -d u g1/dset3 g1/dset4 > ..\..\temptest\h5diff_605.results 2>..\..\temptest\h5diff_605_error.results
+more ..\..\temptest\h5diff_605_error.results >> ..\..\temptest\h5diff_605.results
+del ..\..\temptest\h5diff_605_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -d 0x1 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_606.results 2>..\..\temptest\h5diff_606_error.results
+more ..\..\temptest\h5diff_606_error.results >> ..\..\temptest\h5diff_606.results
+del ..\..\temptest\h5diff_606_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -d "1" g1/dset3 g1/dset4 > ..\..\temptest\h5diff_607.results 2>..\..\temptest\h5diff_607_error.results
+more ..\..\temptest\h5diff_607_error.results >> ..\..\temptest\h5diff_607.results
+del ..\..\temptest\h5diff_607_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -d 1 -d 2 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_608.results 2>..\..\temptest\h5diff_608_error.results
+more ..\..\temptest\h5diff_608_error.results >> ..\..\temptest\h5diff_608.results
+del ..\..\temptest\h5diff_608_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -d 200 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_609.results 2>..\..\temptest\h5diff_609_error.results
+more ..\..\temptest\h5diff_609_error.results >> ..\..\temptest\h5diff_609.results
+del ..\..\temptest\h5diff_609_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -d 1 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_610.results 2>..\..\temptest\h5diff_610_error.results
+more ..\..\temptest\h5diff_610_error.results >> ..\..\temptest\h5diff_610.results
+del ..\..\temptest\h5diff_610_error.results
+
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -r -p g1/dset3 g1/dset4 > ..\..\temptest\h5diff_611.results 2>..\..\temptest\h5diff_611_error.results
+more ..\..\temptest\h5diff_611_error.results >> ..\..\temptest\h5diff_611.results
+del ..\..\temptest\h5diff_611_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -p -4 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_612.results 2>..\..\temptest\h5diff_612_error.results
+more ..\..\temptest\h5diff_612_error.results >> ..\..\temptest\h5diff_612.results
+del ..\..\temptest\h5diff_612_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -p 0 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_613.results 2>..\..\temptest\h5diff_613_error.results
+more ..\..\temptest\h5diff_613_error.results >> ..\..\temptest\h5diff_613.results
+del ..\..\temptest\h5diff_613_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -p u g1/dset3 g1/dset4 > ..\..\temptest\h5diff_614.results 2>..\..\temptest\h5diff_614_error.results
+more ..\..\temptest\h5diff_614_error.results >> ..\..\temptest\h5diff_614.results
+del ..\..\temptest\h5diff_614_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -p 0x1 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_615.results 2>..\..\temptest\h5diff_615_error.results
+more ..\..\temptest\h5diff_615_error.results >> ..\..\temptest\h5diff_615.results
+del ..\..\temptest\h5diff_615_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -p "0.21" g1/dset3 g1/dset4 > ..\..\temptest\h5diff_616.results 2>..\..\temptest\h5diff_616_error.results
+more ..\..\temptest\h5diff_616_error.results >> ..\..\temptest\h5diff_616.results
+del ..\..\temptest\h5diff_616_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_617.results 2>..\..\temptest\h5diff_617_error.results
+more ..\..\temptest\h5diff_617_error.results >> ..\..\temptest\h5diff_617.results
+del ..\..\temptest\h5diff_617_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -p 2 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_618.results 2>..\..\temptest\h5diff_618_error.results
+more ..\..\temptest\h5diff_618_error.results >> ..\..\temptest\h5diff_618.results
+del ..\..\temptest\h5diff_618_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -p 0.005 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_619.results 2>..\..\temptest\h5diff_619_error.results
+more ..\..\temptest\h5diff_619_error.results >> ..\..\temptest\h5diff_619.results
+del ..\..\temptest\h5diff_619_error.results
+
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -n g1/dset3 g1/dset4 > ..\..\temptest\h5diff_620.results 2>..\..\temptest\h5diff_620_error.results
+more ..\..\temptest\h5diff_620_error.results >> ..\..\temptest\h5diff_620.results
+del ..\..\temptest\h5diff_620_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -n -4 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_621.results 2>..\..\temptest\h5diff_621_error.results
+more ..\..\temptest\h5diff_621_error.results >> ..\..\temptest\h5diff_621.results
+del ..\..\temptest\h5diff_621_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -n 0 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_622.results 2>..\..\temptest\h5diff_622_error.results
+more ..\..\temptest\h5diff_622_error.results >> ..\..\temptest\h5diff_622.results
+del ..\..\temptest\h5diff_622_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -n u g1/dset3 g1/dset4 > ..\..\temptest\h5diff_623.results 2>..\..\temptest\h5diff_623_error.results
+more ..\..\temptest\h5diff_623_error.results >> ..\..\temptest\h5diff_623.results
+del ..\..\temptest\h5diff_623_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -n 0x1 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_624.results 2>..\..\temptest\h5diff_624_error.results
+more ..\..\temptest\h5diff_624_error.results >> ..\..\temptest\h5diff_624.results
+del ..\..\temptest\h5diff_624_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -n "2" g1/dset3 g1/dset4 > ..\..\temptest\h5diff_625.results 2>..\..\temptest\h5diff_625_error.results
+more ..\..\temptest\h5diff_625_error.results >> ..\..\temptest\h5diff_625.results
+del ..\..\temptest\h5diff_625_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -n 2 -n 3 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_626.results 2>..\..\temptest\h5diff_626_error.results
+more ..\..\temptest\h5diff_626_error.results >> ..\..\temptest\h5diff_626.results
+del ..\..\temptest\h5diff_626_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -n 200 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_627.results 2>..\..\temptest\h5diff_627_error.results
+more ..\..\temptest\h5diff_627_error.results >> ..\..\temptest\h5diff_627.results
+del ..\..\temptest\h5diff_627_error.results
+
+h5diff%2 ..\..\testfiles\file1.h5 ..\..\testfiles\file2.h5 -n 1 g1/dset3 g1/dset4 > ..\..\temptest\h5diff_628.results 2>..\..\temptest\h5diff_628_error.results
+more ..\..\temptest\h5diff_628_error.results >> ..\..\temptest\h5diff_628.results
+del ..\..\temptest\h5diff_628_error.results
+
+h5diff%2 file1.h6 file2.h6 > ..\..\temptest\h5diff_629.results 2>..\..\temptest\h5diff_629_error.results
+more ..\..\temptest\h5diff_629_error.results >> ..\..\temptest\h5diff_629.results
+del ..\..\temptest\h5diff_629_error.results
+
+
+h5diff%2 ..\..\testfiles\file5.h5 ..\..\testfiles\file6.h5 -v > ..\..\temptest\h5diff_70.results 2>..\..\temptest\h5diff_70_error.results
+more ..\..\temptest\h5diff_70_error.results >> ..\..\temptest\h5diff_70.results
+del ..\..\temptest\h5diff_70_error.results
+
+h5diff%2 ..\..\testfiles\file7.h5 ..\..\testfiles\file8.h5 -v > ..\..\temptest\h5diff_80.results 2>..\..\temptest\h5diff_80_error.results
+more ..\..\temptest\h5diff_80_error.results >> ..\..\temptest\h5diff_80.results
+del ..\..\temptest\h5diff_80_error.results
+
+cd ..\..\temptest
+mkdir fctemp
+
+REM ##############################################################################
+REM ##############################################################################
+REM ###			        T H E   T E S T S                              ###
+REM ##############################################################################
+REM ##############################################################################
+
+
+REM ##############################################################################
+REM ## Common usage
+REM ##############################################################################
+
+type nul > ..\difftest%2_%1.txt
+echo ========================================== >> ..\difftest%2_%1.txt
+echo Testing difftest.bat >> ..\difftest%2_%1.txt
+echo ========================================== >> ..\difftest%2_%1.txt
+
+REM 1.0
+call ..\deleteline h5diff_10.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_10.txt 4
+cd ..\temptest\fctemp
+fc h5diff_10.txt h5diff_10.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff -h                                                      PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff -h                                                      FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 1.1 normal mode
+call ..\deleteline h5diff_11.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_11.txt 4
+cd ..\temptest\fctemp
+fc h5diff_11.txt h5diff_11.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5                                       PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5                                       FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 1.2 normal mode with objects
+call ..\deleteline h5diff_12.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_12.txt 4
+cd ..\temptest\fctemp
+fc h5diff_12.txt h5diff_12.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 g1/dset1 g1/dset2                     PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 g1/dset1 g1/dset2                     FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 1.3 report mode
+call ..\deleteline h5diff_13.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_13.txt 4
+cd ..\temptest\fctemp
+fc h5diff_13.txt h5diff_13.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -r                                    PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -r                                    FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 1.4 report mode with objects
+call ..\deleteline h5diff_14.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_14.txt 4
+cd ..\temptest\fctemp
+fc h5diff_14.txt h5diff_14.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -r g1/dset1 g1/dset2                  PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -r g1/dset1 g1/dset2                  FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 1.5 with -d
+call ..\deleteline h5diff_15.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_15.txt 4
+cd ..\temptest\fctemp
+fc h5diff_15.txt h5diff_15.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -r -d 5 g1/dset3 g1/dset4             PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -r -d 5 g1/dset3 g1/dset4             FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 1.6 with -p
+call ..\deleteline h5diff_16.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_16.txt 4
+cd ..\temptest\fctemp
+fc h5diff_16.txt h5diff_16.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -r -p 0.05 g1/dset3 g1/dset4          PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -r -p 0.05 g1/dset3 g1/dset4          FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 1.7 verbose mode
+call ..\deleteline h5diff_17.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_17.txt 4
+cd ..\temptest\fctemp
+fc h5diff_17.txt h5diff_17.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -v                                    PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -v                                    FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 1.8 quiet mode
+call ..\deleteline h5diff_18.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_18.txt 4
+cd ..\temptest\fctemp
+fc h5diff_18.txt h5diff_18.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -q                                    PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -q                                    FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM ##############################################################################
+REM ## not comparable types
+REM ##############################################################################
+
+REM 2.0
+call ..\deleteline h5diff_20.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_20.txt 4
+cd ..\temptest\fctemp
+fc h5diff_20.txt h5diff_20.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file3.h5 file3.h5 -v dset group                         PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file3.h5 file3.h5 -v dset group                         FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 2.1
+call ..\deleteline h5diff_21.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_21.txt 4
+cd ..\temptest\fctemp
+fc h5diff_21.txt h5diff_21.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file3.h5 file3.h5 -v dset link                          PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file3.h5 file3.h5 -v dset link                          FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 2.2
+call ..\deleteline h5diff_22.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_22.txt 4
+cd ..\temptest\fctemp
+fc h5diff_22.txt h5diff_22.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file3.h5 file3.h5 -v dset type                          PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file3.h5 file3.h5 -v dset type                          FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 2.3
+call ..\deleteline h5diff_23.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_23.txt 4
+cd ..\temptest\fctemp
+fc h5diff_23.txt h5diff_23.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file3.h5 file3.h5 -v group group                        PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file3.h5 file3.h5 -v group group                        FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 2.4
+call ..\deleteline h5diff_24.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_24.txt 4
+cd ..\temptest\fctemp
+fc h5diff_24.txt h5diff_24.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file3.h5 file3.h5 -v type type                          PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file3.h5 file3.h5 -v type type                          FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 2.5
+call ..\deleteline h5diff_25.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_25.txt 4
+cd ..\temptest\fctemp
+fc h5diff_25.txt h5diff_25.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file3.h5 file3.h5 -v link link                          PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file3.h5 file3.h5 -v link link                          FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM ##############################################################################
+REM ## Dataset types
+REM ##############################################################################
+
+REM 5.0
+call ..\deleteline h5diff_50.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_50.txt 4
+cd ..\temptest\fctemp
+fc h5diff_50.txt h5diff_50.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file4.h5 file4.h5 -v dset0a dset0b                      PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file4.h5 file4.h5 -v dset0a dset0b                      FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 5.1
+call ..\deleteline h5diff_51.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_51.txt 4
+cd ..\temptest\fctemp
+fc h5diff_51.txt h5diff_51.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file4.h5 file4.h5 -v dset1a dset1b                      PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file4.h5 file4.h5 -v dset1a dset1b                      FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 5.2
+call ..\deleteline h5diff_52.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_52.txt 4
+cd ..\temptest\fctemp
+fc h5diff_52.txt h5diff_52.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file4.h5 file4.h5 -v dset2a dset2b                      PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file4.h5 file4.h5 -v dset2a dset2b                      FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 5.3
+call ..\deleteline h5diff_53.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_53.txt 4
+cd ..\temptest\fctemp
+fc h5diff_53.txt h5diff_53.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file4.h5 file4.h5 -v dset3a dset4b                      PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file4.h5 file4.h5 -v dset3a dset4b                      FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 5.4
+call ..\deleteline h5diff_54.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_54.txt 4
+cd ..\temptest\fctemp
+fc h5diff_54.txt h5diff_54.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file4.h5 file4.h5 -v dset4a dset4b                      PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file4.h5 file4.h5 -v dset4a dset4b                      FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 5.5
+call ..\deleteline h5diff_55.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_55.txt 4
+cd ..\temptest\fctemp
+fc h5diff_55.txt h5diff_55.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file4.h5 file4.h5 -v dset5a dset5b                      PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file4.h5 file4.h5 -v dset5a dset5b                      FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 5.6
+call ..\deleteline h5diff_56.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_56.txt 4
+cd ..\temptest\fctemp
+fc h5diff_56.txt h5diff_56.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file4.h5 file4.h5 -v dset6a dset6b                      PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file4.h5 file4.h5 -v dset6a dset6b                      FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 5.7
+call ..\deleteline h5diff_57.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_57.txt 4
+cd ..\temptest\fctemp
+fc h5diff_57.txt h5diff_57.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file4.h5 file4.h5 -v dset7a dset7b                      PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file4.h5 file4.h5 -v dset7a dset7b                      FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 5.8
+REM call ..\deleteline h5diff_58.results 1 
+REM cd ..\testfiles
+REM call ..\deleteline h5diff_58.txt 4
+REM cd ..\temptest\fctemp
+REM fc h5diff_58.txt h5diff_58.results >temp.txt
+REM if %ERRORLEVEL%==0 (
+REM    echo Testing h5diff file4.h5 file4.h5 dset8a dset8b                     PASSED >> ..\..\difftest%2_%1.txt
+REM ) else (
+REM    echo Testing h5diff file4.h5 file4.h5 dset8a dset8b                     FAILED >> ..\..\difftest%2_%1.txt
+REM    more temp.txt >> ..\..\difftest%2_%1.txt
+REM )
+REM del temp.txt
+REM cd ..
+
+REM ##############################################################################
+REM ## Error messages
+REM ##############################################################################
+
+REM 6.0: Check if the command line number of arguments is less than 3
+call ..\deleteline h5diff_600.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_600.txt 4
+cd ..\temptest\fctemp
+fc h5diff_600.txt h5diff_600.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5                                                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5                                                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.1: Check for invalid options
+call ..\deleteline h5diff_601.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_601.txt 4
+cd ..\temptest\fctemp
+fc h5diff_601.txt h5diff_601.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -x                                    PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -x                                    FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM ##############################################################################
+REM ## -d 
+REM ##############################################################################
+
+REM 6.2: no value
+call ..\deleteline h5diff_602.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_602.txt 4
+cd ..\temptest\fctemp
+fc h5diff_602.txt h5diff_602.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -d g1/dset3 g1/dset4                  PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -d g1/dset3 g1/dset4                  FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.3: negative value
+call ..\deleteline h5diff_603.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_603.txt 4
+cd ..\temptest\fctemp
+fc h5diff_603.txt h5diff_603.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -d -4 g1/dset3 g1/dset4               PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -d -4 g1/dset3 g1/dset4               FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.4: zero
+call ..\deleteline h5diff_604.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_604.txt 4
+cd ..\temptest\fctemp
+fc h5diff_604.txt h5diff_604.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -d 0 g1/dset3 g1/dset4                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -d 0 g1/dset3 g1/dset4                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.5: non number
+call ..\deleteline h5diff_605.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_605.txt 4
+cd ..\temptest\fctemp
+fc h5diff_605.txt h5diff_605.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -d u g1/dset3 g1/dset4                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -d u g1/dset3 g1/dset4                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.6: hexadecimal
+call ..\deleteline h5diff_606.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_606.txt 4
+cd ..\temptest\fctemp
+fc h5diff_606.txt h5diff_606.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -d 0x1 g1/dset3 g1/dset4              PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -d 0x1 g1/dset3 g1/dset4              FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.7: string
+call ..\deleteline h5diff_607.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_607.txt 4
+cd ..\temptest\fctemp
+fc h5diff_607.txt h5diff_607.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -d "1" g1/dset3 g1/dset4              PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -d "1" g1/dset3 g1/dset4              FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.8: repeated option
+call ..\deleteline h5diff_608.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_608.txt 4
+cd ..\temptest\fctemp
+fc h5diff_608.txt h5diff_608.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -d 1 -d 2 g1/dset3 g1/dset4           PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -d 1 -d 2 g1/dset3 g1/dset4           FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.9: number larger than biggest difference
+call ..\deleteline h5diff_609.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_609.txt 4
+cd ..\temptest\fctemp
+fc h5diff_609.txt h5diff_609.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -d 200 g1/dset3 g1/dset4              PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -d 200 g1/dset3 g1/dset4              FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.10: number smaller than smallest difference
+call ..\deleteline h5diff_610.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_610.txt 4
+cd ..\temptest\fctemp
+fc h5diff_610.txt h5diff_610.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+
+REM ##############################################################################
+REM ## -p
+REM ##############################################################################
+
+
+REM 6.11: no value
+call ..\deleteline h5diff_611.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_611.txt 4
+cd ..\temptest\fctemp
+fc h5diff_611.txt h5diff_611.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -r -p g1/dset3 g1/dset4               PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -r -p g1/dset3 g1/dset4               FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.12: negative value
+call ..\deleteline h5diff_612.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_612.txt 4
+cd ..\temptest\fctemp
+fc h5diff_612.txt h5diff_612.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -p -4 g1/dset3 g1/dset4               PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -p -4 g1/dset3 g1/dset4               FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.13: zero
+call ..\deleteline h5diff_613.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_613.txt 4
+cd ..\temptest\fctemp
+fc h5diff_613.txt h5diff_613.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -p 0 g1/dset3 g1/dset4                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -p 0 g1/dset3 g1/dset4                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.14: non number
+call ..\deleteline h5diff_614.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_614.txt 4
+cd ..\temptest\fctemp
+fc h5diff_614.txt h5diff_614.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -p u g1/dset3 g1/dset4                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -p u g1/dset3 g1/dset4                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.15: hexadecimal
+call ..\deleteline h5diff_615.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_615.txt 4
+cd ..\temptest\fctemp
+fc h5diff_615.txt h5diff_615.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -p 0x1 g1/dset3 g1/dset4              PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -p 0x1 g1/dset3 g1/dset4              FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.16: string
+call ..\deleteline h5diff_616.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_616.txt 4
+cd ..\temptest\fctemp
+fc h5diff_616.txt h5diff_616.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -p "0.21" g1/dset3 g1/dset4           PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -p "0.21" g1/dset3 g1/dset4           FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.17: repeated option
+call ..\deleteline h5diff_617.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_617.txt 4
+cd ..\temptest\fctemp
+fc h5diff_617.txt h5diff_617.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4     PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4     FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.18: number larger than biggest difference
+call ..\deleteline h5diff_618.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_618.txt 4
+cd ..\temptest\fctemp
+fc h5diff_618.txt h5diff_618.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.19: number smaller than smallest difference
+call ..\deleteline h5diff_619.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_619.txt 4
+cd ..\temptest\fctemp
+fc h5diff_619.txt h5diff_619.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4            PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4            FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM ##############################################################################
+REM ## -n
+REM ##############################################################################
+
+REM 6.20: no value
+call ..\deleteline h5diff_620.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_620.txt 4
+cd ..\temptest\fctemp
+fc h5diff_620.txt h5diff_620.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -n g1/dset3 g1/dset4                  PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -n g1/dset3 g1/dset4                  FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.21: negative value
+call ..\deleteline h5diff_621.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_621.txt 4
+cd ..\temptest\fctemp
+fc h5diff_621.txt h5diff_621.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -n -4 g1/dset3 g1/dset4               PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -n -4 g1/dset3 g1/dset4               FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.22: zero
+call ..\deleteline h5diff_622.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_622.txt 4
+cd ..\temptest\fctemp
+fc h5diff_622.txt h5diff_622.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -n 0 g1/dset3 g1/dset4                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -n 0 g1/dset3 g1/dset4                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.23: non number
+call ..\deleteline h5diff_623.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_623.txt 4
+cd ..\temptest\fctemp
+fc h5diff_623.txt h5diff_623.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -n u g1/dset3 g1/dset4                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -n u g1/dset3 g1/dset4                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.24: hexadecimal
+call ..\deleteline h5diff_624.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_624.txt 4
+cd ..\temptest\fctemp
+fc h5diff_624.txt h5diff_624.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -n 0x1 g1/dset3 g1/dset4              PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -n 0x1 g1/dset3 g1/dset4              FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.25: string
+call ..\deleteline h5diff_625.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_625.txt 4
+cd ..\temptest\fctemp
+fc h5diff_625.txt h5diff_625.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -n "2" g1/dset3 g1/dset4              PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -n "2" g1/dset3 g1/dset4              FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.26: repeated option
+call ..\deleteline h5diff_626.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_626.txt 4
+cd ..\temptest\fctemp
+fc h5diff_626.txt h5diff_626.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4           PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4           FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.27: number larger than biggest difference
+call ..\deleteline h5diff_627.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_627.txt 4
+cd ..\temptest\fctemp
+fc h5diff_627.txt h5diff_627.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4              PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4              FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM 6.28: number smaller than smallest difference
+call ..\deleteline h5diff_628.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_628.txt 4
+cd ..\temptest\fctemp
+fc h5diff_628.txt h5diff_628.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4                PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4                FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM ##############################################################################
+REM ## non valid files
+REM ##############################################################################
+
+call ..\deleteline h5diff_629.results 0 
+cd ..\testfiles
+call ..\deleteline h5diff_629.txt 3
+cd ..\temptest\fctemp
+fc h5diff_629.txt h5diff_629.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file1.h6 file2.h6                                       PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file1.h6 file2.h6                                       FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM ##############################################################################
+REM ## attributes
+REM ##############################################################################
+
+call ..\deleteline h5diff_70.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_70.txt 4
+cd ..\temptest\fctemp
+fc h5diff_70.txt h5diff_70.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file5.h5 file6.h5 -v                                    PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file5.h5 file6.h5 -v                                    FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM ##############################################################################
+REM ## all dataset datatypes
+REM ##############################################################################
+
+call ..\deleteline h5diff_80.results 1 
+cd ..\testfiles
+call ..\deleteline h5diff_80.txt 4
+cd ..\temptest\fctemp
+fc h5diff_80.txt h5diff_80.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5diff file7.h5 file8.h5 -v                                    PASSED >> ..\..\difftest%2_%1.txt
+) else (
+   echo Testing h5diff file7.h5 file8.h5 -v                                    FAILED >> ..\..\difftest%2_%1.txt
+   more temp.txt >> ..\..\difftest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM ##############################################################################
+REM ## END
+REM ##############################################################################
+
+cd ..
+
+rmdir /s/q temptest
\ No newline at end of file
diff --git a/windows/tools/dumptest.bat b/windows/tools/dumptest.bat
new file mode 100755
index 0000000..559da46
--- /dev/null
+++ b/windows/tools/dumptest.bat
@@ -0,0 +1,2536 @@
+@ ECHO OFF
+
+REM TOOLTEST tfamily.ddl --filedriver=family tfamily%05d.h5
+REM TOOLTEST thlink.h5.xml --xml thlink.h5
+REM TOOLTEST tmany.h5.xml --xml tmany.h5
+REM were turned off due to unsolved failures.
+
+mkdir temptest
+
+cd h5dump%2\%1
+
+h5dump%2 ..\..\testfiles\tgroup.h5 > ..\..\temptest\tgroup-1.results 2>..\..\temptest\tgroup-1_error.results
+more ..\..\temptest\tgroup-1_error.results >> ..\..\temptest\tgroup-1.results
+del ..\..\temptest\tgroup-1_error.results
+
+h5dump%2 -g /g2 -g / -g /y ..\..\testfiles\tgroup.h5 > ..\..\temptest\tgroup-2.results 2>..\..\temptest\tgroup-2_error.results
+more ..\..\temptest\tgroup-2_error.results >> ..\..\temptest\tgroup-2.results
+del ..\..\temptest\tgroup-2_error.results
+
+h5dump%2 ..\..\testfiles\tdset.h5 > ..\..\temptest\tdset-1.results 2>..\..\temptest\tdset-1_error.results
+more ..\..\temptest\tdset-1_error.results >> ..\..\temptest\tdset-1.results
+del ..\..\temptest\tdset-1_error.results
+
+h5dump%2 -H -d dset1 -d /dset2 --dataset=dset3 ..\..\testfiles\tdset.h5 > ..\..\temptest\tdset-2.results 2>..\..\temptest\tdset-2_error.results
+more ..\..\temptest\tdset-2_error.results >> ..\..\temptest\tdset-2.results
+del ..\..\temptest\tdset-2_error.results
+
+h5dump%2 ..\..\testfiles\tattr.h5 > ..\..\temptest\tattr-1.results 2>..\..\temptest\tattr-1_error.results
+more ..\..\temptest\tattr-1_error.results >> ..\..\temptest\tattr-1.results
+del ..\..\temptest\tattr-1_error.results
+
+h5dump%2 -a /attr1 --attribute /attr4 --attribute=/attr5 ..\..\testfiles\tattr.h5 > ..\..\temptest\tattr-2.results 2>..\..\temptest\tattr-2_error.results
+more ..\..\temptest\tattr-2_error.results >> ..\..\temptest\tattr-2.results
+del ..\..\temptest\tattr-2_error.results
+
+h5dump%2 --header -a /attr2 --attribute=/attr ..\..\testfiles\tattr.h5 > ..\..\temptest\tattr-3.results 2>..\..\temptest\tattr-3_error.results
+more ..\..\temptest\tattr-3_error.results >> ..\..\temptest\tattr-3.results
+del ..\..\temptest\tattr-3_error.results
+
+h5dump%2 -A ..\..\testfiles\tnamed_dtype_attr.h5 > ..\..\temptest\tnamed_dtype_attr.results 2>..\..\temptest\tnamed_dtype_attr_error.results
+more ..\..\temptest\tnamed_dtype_attr_error.results >> ..\..\temptest\tnamed_dtype_attr.results
+del ..\..\temptest\tnamed_dtype_attr_error.results
+
+h5dump%2 ..\..\testfiles\tslink.h5 > ..\..\temptest\tslink-1.results 2>..\..\temptest\tslink-1_error.results
+more ..\..\temptest\tslink-1_error.results >> ..\..\temptest\tslink-1.results
+del ..\..\temptest\tslink-1_error.results
+
+h5dump%2 -l slink2 ..\..\testfiles\tslink.h5 > ..\..\temptest\tslink-2.results 2>..\..\temptest\tslink-2_error.results
+more ..\..\temptest\tslink-2_error.results >> ..\..\temptest\tslink-2.results
+del ..\..\temptest\tslink-2_error.results
+
+h5dump%2 ..\..\testfiles\thlink.h5 > ..\..\temptest\thlink-1.results 2>..\..\temptest\thlink-1_error.results
+more ..\..\temptest\thlink-1_error.results >> ..\..\temptest\thlink-1.results
+del ..\..\temptest\thlink-1_error.results
+
+h5dump%2 -d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3 ..\..\testfiles\thlink.h5 > ..\..\temptest\thlink-2.results 2>..\..\temptest\thlink-2_error.results
+more ..\..\temptest\thlink-2_error.results >> ..\..\temptest\thlink-2.results
+del ..\..\temptest\thlink-2_error.results
+
+h5dump%2 -d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1 ..\..\testfiles\thlink.h5 > ..\..\temptest\thlink-3.results 2>..\..\temptest\thlink-3_error.results
+more ..\..\temptest\thlink-3_error.results >> ..\..\temptest\thlink-3.results
+del ..\..\temptest\thlink-3_error.results
+
+h5dump%2 -g /g1 ..\..\testfiles\thlink.h5 > ..\..\temptest\thlink-4.results 2>..\..\temptest\thlink-4_error.results
+more ..\..\temptest\thlink-4_error.results >> ..\..\temptest\thlink-4.results
+del ..\..\temptest\thlink-4_error.results
+
+h5dump%2 -d /dset1 -g /g2 -d /g1/dset2 ..\..\testfiles\thlink.h5 > ..\..\temptest\thlink-5.results 2>..\..\temptest\thlink-5_error.results
+more ..\..\temptest\thlink-5_error.results >> ..\..\temptest\thlink-5.results
+del ..\..\temptest\thlink-5_error.results
+
+h5dump%2 ..\..\testfiles\tcompound.h5 > ..\..\temptest\tcomp-1.results 2>..\..\temptest\tcomp-1_error.results
+more ..\..\temptest\tcomp-1_error.results >> ..\..\temptest\tcomp-1.results
+del ..\..\temptest\tcomp-1_error.results
+
+h5dump%2 -t /type1 --datatype /type2 --datatype=/group1/type3 ..\..\testfiles\tcompound.h5 > ..\..\temptest\tcomp-2.results 2>..\..\temptest\tcomp-2_error.results
+more ..\..\temptest\tcomp-2_error.results >> ..\..\temptest\tcomp-2.results
+del ..\..\temptest\tcomp-2_error.results
+
+h5dump%2  -t /#6632:0 -g /group2 ..\..\testfiles\tcompound.h5 > ..\..\temptest\tcomp-3.results 2>..\..\temptest\tcomp-3_error.results
+more ..\..\temptest\tcomp-3_error.results >> ..\..\temptest\tcomp-3.results
+del ..\..\temptest\tcomp-3_error.results
+
+h5dump%2 ..\..\testfiles\tcompound_complex.h5 > ..\..\temptest\tcompound_complex.results 2>..\..\temptest\tcompound_complex_error.results
+more ..\..\temptest\tcompound_complex_error.results >> ..\..\temptest\tcompound_complex.results
+del ..\..\temptest\tcompound_complex_error.results
+
+h5dump%2 ..\..\testfiles\tnestedcomp.h5 > ..\..\temptest\tnestcomp-1.results 2>..\..\temptest\tnestcomp-1_error.results
+more ..\..\temptest\tnestcomp-1_error.results >> ..\..\temptest\tnestcomp-1.results
+del ..\..\temptest\tnestcomp-1_error.results
+
+h5dump%2 ..\..\testfiles\tall.h5 > ..\..\temptest\tall-1.results 2>..\..\temptest\tall-1_error.results
+more ..\..\temptest\tall-1_error.results >> ..\..\temptest\tall-1.results
+del ..\..\temptest\tall-1_error.results
+
+h5dump%2 --header -g /g1/g1.1 -a attr2 ..\..\testfiles\tall.h5 > ..\..\temptest\tall-2.results 2>..\..\temptest\tall-2_error.results
+more ..\..\temptest\tall-2_error.results >> ..\..\temptest\tall-2.results
+del ..\..\temptest\tall-2_error.results
+
+h5dump%2 -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink ..\..\testfiles\tall.h5 > ..\..\temptest\tall-3.results 2>..\..\temptest\tall-3_error.results
+more ..\..\temptest\tall-3_error.results >> ..\..\temptest\tall-3.results
+del ..\..\temptest\tall-3_error.results
+
+h5dump%2 ..\..\testfiles\tloop.h5 > ..\..\temptest\tloop-1.results 2>..\..\temptest\tloop-1_error.results
+more ..\..\temptest\tloop-1_error.results >> ..\..\temptest\tloop-1-1.results
+del ..\..\temptest\tloop-1_error.results
+
+h5dump%2 ..\..\testfiles\tstr.h5 > ..\..\temptest\tstr-1.results 2>..\..\temptest\tstr-1_error.results
+more ..\..\temptest\tstr-1_error.results >> ..\..\temptest\tstr-1.results
+del ..\..\temptest\tstr-1_error.results
+
+h5dump%2 ..\..\testfiles\tstr2.h5 > ..\..\temptest\tstr-2.results 2>..\..\temptest\tstr-2_error.results
+more ..\..\temptest\tstr-2_error.results >> ..\..\temptest\tstr-2.results
+del ..\..\temptest\tstr-2_error.results
+
+h5dump%2 ..\..\testfiles\tsaf.h5 > ..\..\temptest\tsaf.results 2>..\..\temptest\tsaf_error.results
+more ..\..\temptest\tsaf_error.results >> ..\..\temptest\tsaf.results
+del ..\..\temptest\tsaf_error.results
+
+h5dump%2 ..\..\testfiles\tvldtypes1.h5 > ..\..\temptest\tvldtypes1.results 2>..\..\temptest\tvldtypes1_error.results
+more ..\..\temptest\tvldtypes1_error.results >> ..\..\temptest\tvldtypes1.results
+del ..\..\temptest\tvldtypes1_error.results
+
+h5dump%2 ..\..\testfiles\tvldtypes2.h5 > ..\..\temptest\tvldtypes2.results 2>..\..\temptest\tvldtypes2_error.results
+more ..\..\temptest\tvldtypes2_error.results >> ..\..\temptest\tvldtypes2.results
+del ..\..\temptest\tvldtypes2_error.results
+
+h5dump%2 ..\..\testfiles\tvldtypes3.h5 > ..\..\temptest\tvldtypes3.results 2>..\..\temptest\tvldtypes3_error.results
+more ..\..\temptest\tvldtypes3_error.results >> ..\..\temptest\tvldtypes3.results
+del ..\..\temptest\tvldtypes3_error.results
+
+h5dump%2 ..\..\testfiles\tvldtypes4.h5 > ..\..\temptest\tvldtypes4.results 2>..\..\temptest\tvldtypes4_error.results
+more ..\..\temptest\tvldtypes4_error.results >> ..\..\temptest\tvldtypes4.results
+del ..\..\temptest\tvldtypes4_error.results
+
+h5dump%2 ..\..\testfiles\tvldtypes5.h5 > ..\..\temptest\tvldtypes5.results 2>..\..\temptest\tvldtypes5_error.results
+more ..\..\temptest\tvldtypes5_error.results >> ..\..\temptest\tvldtypes5.results
+del ..\..\temptest\tvldtypes5_error.results
+
+h5dump%2 ..\..\testfiles\tvlstr.h5 > ..\..\temptest\tvlstr.results 2>..\..\temptest\tvlstr_error.results
+more ..\..\temptest\tvlstr_error.results >> ..\..\temptest\tvlstr.results
+del ..\..\temptest\tvlstr_error.results
+
+h5dump%2 ..\..\testfiles\tarray1.h5 > ..\..\temptest\tarray1.results 2>..\..\temptest\tarray1_error.results
+more ..\..\temptest\tarray1_error.results >> ..\..\temptest\tarray1.results
+del ..\..\temptest\tarray1_error.results
+
+h5dump%2 ..\..\testfiles\tarray2.h5 > ..\..\temptest\tarray2.results 2>..\..\temptest\tarray2_error.results
+more ..\..\temptest\tarray2_error.results >> ..\..\temptest\tarray2.results
+del ..\..\temptest\tarray2_error.results
+
+h5dump%2 ..\..\testfiles\tarray3.h5 > ..\..\temptest\tarray3.results 2>..\..\temptest\tarray3_error.results
+more ..\..\temptest\tarray3_error.results >> ..\..\temptest\tarray3.results
+del ..\..\temptest\tarray3_error.results
+
+h5dump%2 ..\..\testfiles\tarray4.h5 > ..\..\temptest\tarray4.results 2>..\..\temptest\tarray4_error.results
+more ..\..\temptest\tarray4_error.results >> ..\..\temptest\tarray4.results
+del ..\..\temptest\tarray4_error.results
+
+h5dump%2 ..\..\testfiles\tarray5.h5 > ..\..\temptest\tarray5.results 2>..\..\temptest\tarray5_error.results
+more ..\..\temptest\tarray5_error.results >> ..\..\temptest\tarray5.results
+del ..\..\temptest\tarray5_error.results
+
+h5dump%2 ..\..\testfiles\tarray6.h5 > ..\..\temptest\tarray6.results 2>..\..\temptest\tarray6_error.results
+more ..\..\temptest\tarray6_error.results >> ..\..\temptest\tarray6.results
+del ..\..\temptest\tarray6_error.results
+
+h5dump%2 ..\..\testfiles\tarray7.h5 > ..\..\temptest\tarray7.results 2>..\..\temptest\tarray7_error.results
+more ..\..\temptest\tarray7_error.results >> ..\..\temptest\tarray7.results
+del ..\..\temptest\tarray7_error.results
+
+h5dump%2 ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty.results 2>..\..\temptest\tempty_error.results
+more ..\..\temptest\tempty_error.results >> ..\..\temptest\tempty.results
+del ..\..\temptest\tempty_error.results
+
+h5dump%2 ..\..\testfiles\tgrp_comments.h5 > ..\..\temptest\tgrp_comments.results 2>..\..\temptest\tgrp_comments_error.results
+more ..\..\temptest\tgrp_comments_error.results >> ..\..\temptest\tgrp_comments.results
+del ..\..\temptest\tgrp_comments_error.results
+
+h5dump%2 --filedriver=split ..\..\testfiles\tsplit_file > ..\..\temptest\tsplit_file.results 2>..\..\temptest\tsplit_file_error.results
+more ..\..\temptest\tsplit_file_error.results >> ..\..\temptest\tsplit_file.results
+del ..\..\temptest\tsplit_file_error.results
+
+REM h5dump%2 --filedriver=family  ..\..\testfiles\tfamily%05d.h5 > ..\..\temptest\tfamily.results 2>..\..\temptest\thlink-5_error.results
+REM more ..\..\temptest\tdset-1_error.results >> ..\..\temptest\tdset-1.results
+REM del ..\..\temptest\tdset-1_error.results
+
+h5dump%2 --filedriver=multi ..\..\testfiles\tmulti > ..\..\temptest\tmulti.results 2>..\..\temptest\tmulti_error.results
+more ..\..\temptest\tmulti_error.results >> ..\..\temptest\tmulti.results
+del ..\..\temptest\tmulti_error.results
+ 
+h5dump%2 -w157 ..\..\testfiles\tlarge_objname.h5 > ..\..\temptest\tlarge_objname.results 2>..\..\temptest\tlarge_objname_error.results
+more ..\..\temptest\tlarge_objname_error.results >> ..\..\temptest\tlarge_objname.results
+del ..\..\temptest\tlarge_objname_error.results
+
+h5dump%2 -A ..\..\testfiles\tall.h5 > ..\..\temptest\tall-2A.results 2>..\..\temptest\tall-2A_error.results
+more ..\..\temptest\tall-2A_error.results >> ..\..\temptest\tall-2A.results
+del ..\..\temptest\tall-2A_error.results
+  
+h5dump%2 --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 ..\..\testfiles\tall.h5 > ..\..\temptest\tall-4s.results 2>..\..\temptest\tall-4s_error.results
+more ..\..\temptest\tall-4s_error.results >> ..\..\temptest\tall-4s.results
+del ..\..\temptest\tall-4s_error.results
+
+h5dump%2 -d "/g1/g1.1/dset1.1.2[0;2;10;]" ..\..\testfiles\tall.h5 > ..\..\temptest\tall-5s.results 2>..\..\temptest\tall-5s_error.results
+more ..\..\temptest\tall-5s_error.results >> ..\..\temptest\tall-5s.results
+del ..\..\temptest\tall-5s_error.results
+
+h5dump%2 -d "/dset1[1,1;;;]" ..\..\testfiles\tdset.h5 > ..\..\temptest\tdset-3s.results 2>..\..\temptest\tdset-3s_error.results
+more ..\..\temptest\tdset-3s_error.results >> ..\..\temptest\tdset-3s.results
+del ..\..\temptest\tdset-3s_error.results
+ 
+h5dump%2 -d "/dset1[;3,2;4,4;1,4]" ..\..\testfiles\tdset2.h5 > ..\..\temptest\tdset2-1s.results 2>..\..\temptest\tdset2-1s_error.results
+more ..\..\temptest\tdset2-1s_error.results >> ..\..\temptest\tdset2-1s.results
+del ..\..\temptest\tdset2-1s_error.results
+ 
+h5dump%2 -r ..\..\testfiles\tchar.h5 > ..\..\temptest\tchar1.results 2>..\..\temptest\tchar1_error.results
+more ..\..\temptest\tchar1_error.results >> ..\..\temptest\tchar1.results
+del ..\..\temptest\tchar1_error.results
+
+h5dump%2 1> ..\..\temptest\tnofilename.results 2> ..\..\temptest\tnofilename_error.results
+more ..\..\temptest\tnofilename_error.results >> ..\..\temptest\tnofilename.results
+del ..\..\temptest\tnofilename_error.results
+
+h5dump%2 -H -B -d dset ..\..\testfiles\tfcontents1.h5 > ..\..\temptest\tboot1.results 2>..\..\temptest\tboot1_error.results
+more ..\..\temptest\tboot1_error.results >> ..\..\temptest\tboot1.results
+del ..\..\temptest\tboot1_error.results
+
+h5dump%2 -B ..\..\testfiles\tfcontents2.h5 > ..\..\temptest\tboot2.results 2>..\..\temptest\tboot2_error.results
+more ..\..\temptest\tboot2_error.results >> ..\..\temptest\tboot2.results
+del ..\..\temptest\tboot2_error.results
+
+h5dump%2 -p -d bogus ..\..\testfiles\tfcontents1.h5 > ..\..\temptest\tperror.results 2>..\..\temptest\tperror_error.results
+more ..\..\temptest\tperror_error.results >> ..\..\temptest\tperror.results
+del ..\..\temptest\tperror_error.results
+
+h5dump%2 -n ..\..\testfiles\tfcontents1.h5 > ..\..\temptest\tcontents.results 2>..\..\temptest\tcontents_error.results
+more ..\..\temptest\tcontents_error.results >> ..\..\temptest\tcontents.results
+del ..\..\temptest\tcontents_error.results
+
+h5dump%2 -H -p -d compact ..\..\testfiles\tfilters.h5 > ..\..\temptest\tcompact.results 2>..\..\temptest\tcompact_error.results
+more ..\..\temptest\tcompact_error.results >> ..\..\temptest\tcompact.results
+del ..\..\temptest\tcompact_error.results
+
+h5dump%2 -H -p -d contiguous ..\..\testfiles\tfilters.h5 > ..\..\temptest\tcontiguos.results 2>..\..\temptest\tcontiguos_error.results
+more ..\..\temptest\tcontiguos_error.results >> ..\..\temptest\tcontiguos.results
+del ..\..\temptest\tcontiguos_error.results
+
+h5dump%2 -H -p -d chunked ..\..\testfiles\tfilters.h5 > ..\..\temptest\tchunked.results 2>..\..\temptest\tchunked_error.results
+more ..\..\temptest\tchunked_error.results >> ..\..\temptest\tchunked.results
+del ..\..\temptest\tchunked_error.results
+
+h5dump%2 -H -p -d external ..\..\testfiles\tfilters.h5 > ..\..\temptest\texternal.results 2>..\..\temptest\texternal_error.results
+more ..\..\temptest\texternal_error.results >> ..\..\temptest\texternal.results
+del ..\..\temptest\texternal_error.results
+
+h5dump%2 -p ..\..\testfiles\tfvalues.h5 > ..\..\temptest\tfill.results 2>..\..\temptest\tfill_error.results
+more ..\..\temptest\tfill_error.results >> ..\..\temptest\tfill.results
+del ..\..\temptest\tfill_error.results
+
+h5dump%2 ..\..\testfiles\tattr2.h5 > ..\..\temptest\treference.results 2>..\..\temptest\treference_error.results
+more ..\..\temptest\treference_error.results >> ..\..\temptest\treference.results
+del ..\..\temptest\treference_error.results
+
+h5dump%2 -e ..\..\testfiles\tstr3.h5 > ..\..\temptest\tstringe.results 2>..\..\temptest\tstringe_error.results
+more ..\..\temptest\tstringe_error.results >> ..\..\temptest\tstringe.results
+del ..\..\temptest\tstringe_error.results
+
+h5dump%2 ..\..\testfiles\tstr3.h5 > ..\..\temptest\tstring.results 2>..\..\temptest\tstring_error.results
+more ..\..\temptest\tstring_error.results >> ..\..\temptest\tstring.results
+del ..\..\temptest\tstring_error.results
+
+h5dump%2 -r -d str4 ..\..\testfiles\tstr3.h5 > ..\..\temptest\tstring2.results 2>..\..\temptest\tstring2_error.results
+more ..\..\temptest\tstring2_error.results >> ..\..\temptest\tstring2.results
+del ..\..\temptest\tstring2_error.results
+
+h5dump%2 ..\..\testfiles\taindices.h5 > ..\..\temptest\tindicesyes.results 2>..\..\temptest\tindicesyes_error.results
+more ..\..\temptest\tindicesyes_error.results >> ..\..\temptest\tindicesyes.results
+del ..\..\temptest\tindicesyes_error.results
+
+h5dump%2 -y ..\..\testfiles\taindices.h5 > ..\..\temptest\tindicesno.results 2>..\..\temptest\tindicesno_error.results
+more ..\..\temptest\tindicesno_error.results >> ..\..\temptest\tindicesno.results
+del ..\..\temptest\tindicesno_error.results
+
+if "%HDF5_EXT_SZIP%"==""  GOTO NEXTSTEP1
+if %HDF5_EXT_SZIP%==szlib.lib (
+   h5dump%2 -H -p -d szip ..\..\testfiles\tfilters.h5 > ..\..\temptest\tszip.results 2>..\..\temptest\tszip_error.results
+   more ..\..\temptest\tszip_error.results >> ..\..\temptest\tszip.results
+   del ..\..\temptest\tszip_error.results
+)
+
+:NEXTSTEP1
+
+if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP2
+if %HDF5_EXT_ZLIB%==zlib.lib (
+   h5dump%2 -H -p -d deflate ..\..\testfiles\tfilters.h5 > ..\..\temptest\tdeflate.results 2>..\..\temptest\tdeflate_error.results
+   more ..\..\temptest\tdeflate_error.results >> ..\..\temptest\tdeflate.results
+   del ..\..\temptest\tdeflate_error.results
+)
+
+:NEXTSTEP2
+
+h5dump%2 -H -p -d shuffle ..\..\testfiles\tfilters.h5 > ..\..\temptest\tshuffle.results 2>..\..\temptest\tshuffle_error.results
+more ..\..\temptest\tshuffle_error.results >> ..\..\temptest\tshuffle.results
+del ..\..\temptest\tshuffle_error.results
+
+h5dump%2 -H -p -d fletcher32 ..\..\testfiles\tfilters.h5 > ..\..\temptest\tfletcher32.results 2>..\..\temptest\tfletcher32_error.results
+more ..\..\temptest\tfletcher32_error.results >> ..\..\temptest\tfletcher32.results
+del ..\..\temptest\tfletcher32_error.results
+
+if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP3
+if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP3
+if %HDF5_EXT_ZLIB%==zlib.lib (
+   if %HDF5_EXT_SZIP%==szlib.lib (
+      h5dump%2 -H -p -d all ..\..\testfiles\tfilters.h5 > ..\..\temptest\tallfilters.results 2>..\..\temptest\tallfilters_error.results
+      more ..\..\temptest\tallfilters_error.results >> ..\..\temptest\tallfilters.results
+      del ..\..\temptest\tallfilters_error.results
+   )
+)
+
+:NEXTSTEP3
+
+h5dump%2 -H  -p -d myfilter ..\..\testfiles\tfilters.h5 > ..\..\temptest\tuserfilter.results 2>..\..\temptest\tuserfilter_error.results
+more ..\..\temptest\tuserfilter_error.results >> ..\..\temptest\tuserfilter.results
+del ..\..\temptest\tuserfilter_error.results
+
+h5dump%2 ..\..\testfiles\tnullspace.h5 > ..\..\temptest\tnullspace.results 2>..\..\temptest\tnullspace_error.results
+more ..\..\temptest\tnullspace_error.results >> ..\..\temptest\tnullspace.results
+del ..\..\temptest\tnullspace_error.results
+
+h5dump%2 --xml ..\..\testfiles\tall.h5 > ..\..\temptest\tall.h5.xml.results 2>..\..\temptest\tall.h5.xml_error.results
+more ..\..\temptest\tall.h5.xml_error.results >> ..\..\temptest\tall.h5.xml.results
+del ..\..\temptest\tall.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tarray1.h5 > ..\..\temptest\tarray1.h5.xml.results 2>..\..\temptest\tarray1.h5.xml_error.results
+more ..\..\temptest\tarray1.h5.xml_error.results >> ..\..\temptest\tarray1.h5.xml.results
+del ..\..\temptest\tarray1.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tarray2.h5 > ..\..\temptest\tarray2.h5.xml.results 2>..\..\temptest\tarray2.h5.xml_error.results
+more ..\..\temptest\tarray2.h5.xml_error.results >> ..\..\temptest\tarray2.h5.xml.results
+del ..\..\temptest\tarray2.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tarray3.h5 > ..\..\temptest\tarray3.h5.xml.results 2>..\..\temptest\tarray3.h5.xml_error.results
+more ..\..\temptest\tarray3.h5.xml_error.results >> ..\..\temptest\tarray3.h5.xml.results
+del ..\..\temptest\tarray3.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tarray6.h5 > ..\..\temptest\tarray6.h5.xml.results 2>..\..\temptest\tarray6.h5.xml_error.results
+more ..\..\temptest\tarray6.h5.xml_error.results >> ..\..\temptest\tarray6.h5.xml.results
+del ..\..\temptest\tarray6.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tarray7.h5 > ..\..\temptest\tarray7.h5.xml.results 2>..\..\temptest\tarray7.h5.xml_error.results
+more ..\..\temptest\tarray7.h5.xml_error.results >> ..\..\temptest\tarray7.h5.xml.results
+del ..\..\temptest\tarray7.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tattr.h5 > ..\..\temptest\tattr.h5.xml.results 2>..\..\temptest\tattr.h5.xml_error.results
+more ..\..\temptest\tattr.h5.xml_error.results >> ..\..\temptest\tattr.h5.xml.results
+del ..\..\temptest\tattr.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tbitfields.h5 > ..\..\temptest\tbitfields.h5.xml.results 2>..\..\temptest\tbitfields.h5.xml_error.results
+more ..\..\temptest\tbitfields.h5.xml_error.results >> ..\..\temptest\tbitfields.h5.xml.results
+del ..\..\temptest\tbitfields.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tcompound.h5 > ..\..\temptest\tcompound.h5.xml.results 2>..\..\temptest\tcompound.h5.xml_error.results
+more ..\..\temptest\tcompound.h5.xml_error.results >> ..\..\temptest\tcompound.h5.xml-1.results
+del ..\..\temptest\tcompound.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tcompound2.h5 > ..\..\temptest\tcompound2.h5.xml.results 2>..\..\temptest\tcompound2.h5.xml_error.results
+more ..\..\temptest\tcompound2.h5.xml_error.results >> ..\..\temptest\tcompound2.h5.xml.results
+del ..\..\temptest\tcompound2.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tdatareg.h5 > ..\..\temptest\tdatareg.h5.xml.results 2>..\..\temptest\tdatareg.h5.xml_error.results
+more ..\..\temptest\tdatareg.h5.xml_error.results >> ..\..\temptest\tdatareg.h5.xml.results
+del ..\..\temptest\tdatareg.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tdset.h5 > ..\..\temptest\tdset.h5.xml.results 2>..\..\temptest\tdset.h5.xml_error.results
+more ..\..\temptest\tdset.h5.xml_error.results >> ..\..\temptest\tdset.h5.xml.results
+del ..\..\temptest\tdset.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tdset2.h5 > ..\..\temptest\tdset2.h5.xml.results 2>..\..\temptest\tdset2.h5.xml_error.results
+more ..\..\temptest\tdset2.h5.xml_error.results >> ..\..\temptest\tdset2.h5.xml.results
+del ..\..\temptest\tdset2.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty.h5.xml.results 2>..\..\temptest\tempty.h5.xm_error.results
+more ..\..\temptest\tempty.h5.xm_error.results >> ..\..\temptest\tempty.h5.xm.results
+del ..\..\temptest\tempty.h5.xm_error.results
+
+h5dump%2 --xml ..\..\testfiles\tenum.h5 > ..\..\temptest\tenum.h5.xml.results 2>..\..\temptest\tenum.h5.xml_error.results
+more ..\..\temptest\tenum.h5.xml_error.results >> ..\..\temptest\tenum.h5.xml.results
+del ..\..\temptest\tenum.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tgroup.h5 > ..\..\temptest\tgroup.h5.xml.results 2>..\..\temptest\tgroup.h5.xml_error.results
+more ..\..\temptest\tgroup.h5.xml_error.results >> ..\..\temptest\tgroup.h5.xml.results
+del ..\..\temptest\tgroup.h5.xml_error.results
+
+REM h5dump%2 --xml ..\..\testfiles\thlink.h5 > ..\..\temptest\thlink.h5.xml.results 2>..\..\temptest\thlink.h5.xml_error.results
+REM more ..\..\temptest\thlink.h5.xml_error.results >> ..\..\temptest\thlink.h5.xml.results
+REM del ..\..\temptest\thlink.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tloop.h5 > ..\..\temptest\tloop.h5.xml.results 2>..\..\temptest\tloop.h5.xml_error.results
+more ..\..\temptest\tloop.h5.xml_error.results >> ..\..\temptest\tloop.h5.xml.results
+del ..\..\temptest\tloop.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tloop2.h5 > ..\..\temptest\tloop2.h5.xml.results 2>..\..\temptest\tloop2.h5.xml_error.results
+more ..\..\temptest\tloop2.h5.xml_error.results >> ..\..\temptest\tloop2.h5.xml.results
+del ..\..\temptest\tloop2.h5.xml_error.results
+
+REM h5dump%2 --xml ..\..\testfiles\tmany.h5 > ..\..\temptest\tmany.h5.xml.results 2>..\..\temptest\tmany.h5.xml_error.results
+REM more ..\..\temptest\tmany.h5.xml_error.results >> ..\..\temptest\tmany.h5.xml.results
+REM del ..\..\temptest\tmany.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tname-amp.h5 > ..\..\temptest\tname-amp.h5.xml.results 2>..\..\temptest\tname-amp.h5.xml_error.results
+more ..\..\temptest\tname-amp.h5.xml_error.results >> ..\..\temptest\tname-amp.h5.xml.results
+del ..\..\temptest\tname-amp.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tname-apos.h5 > ..\..\temptest\tname-apos.h5.xml.results 2>..\..\temptest\tname-apos.h5.xml_error.results
+more ..\..\temptest\tname-apos.h5.xml_error.results >> ..\..\temptest\tname-apos.h5.xml.results
+del ..\..\temptest\tname-apos.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tname-gt.h5 > ..\..\temptest\tname-gt.h5.xml.results 2>..\..\temptest\tname-gt.h5.xml_error.results
+more ..\..\temptest\tname-gt.h5.xml_error.results >> ..\..\temptest\tname-gt.h5.xml.results
+del ..\..\temptest\tname-gt.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tname-lt.h5 > ..\..\temptest\tname-lt.h5.xml.results 2>..\..\temptest\tname-lt.h5.xml_error.results
+more ..\..\temptest\tname-lt.h5.xml_error.results >> ..\..\temptest\tname-lt.h5.xml.results
+del ..\..\temptest\tname-lt.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tname-quot.h5 > ..\..\temptest\tname-quot.h5.xml.results 2>..\..\temptest\tname-quot.h5.xml_error.results
+more ..\..\temptest\tname-quot.h5.xml_error.results >> ..\..\temptest\tname-quot.h5.xml.results
+del ..\..\temptest\tname-quot.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tname-sp.h5 > ..\..\temptest\tname-sp.h5.xml.results 2>..\..\temptest\tname-sp.h5.xml_error.results
+more ..\..\temptest\tname-sp.h5.xml_error.results >> ..\..\temptest\tname-sp.h5.xml.results
+del ..\..\temptest\tname-sp.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tnestedcomp.h5 > ..\..\temptest\tnestedcomp.h5.xml.results 2>..\..\temptest\tnestedcomp.h5.xml_error.results
+more ..\..\temptest\tnestedcomp.h5.xml_error.results >> ..\..\temptest\tnestedcomp.h5.xml.results
+del ..\..\temptest\tnestedcomp.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tcompound_complex.h5 > ..\..\temptest\tcompound_complex.h5.xml.results 2>..\..\temptest\tcompound_complex.h5.xml_error.results
+more ..\..\temptest\tcompound_complex.h5.xml_error.results >> ..\..\temptest\tcompound_complex.h5.xml.results
+del ..\..\temptest\tcompound_complex.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tnodata.h5 > ..\..\temptest\tnodata.h5.xml.results 2>..\..\temptest\tnodata.h5.xml_error.results
+more ..\..\temptest\tnodata.h5.xml_error.results >> ..\..\temptest\tnodata.h5.xml.results
+del ..\..\temptest\tnodata.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tobjref.h5 > ..\..\temptest\tobjref.h5.xml.results 2>..\..\temptest\tobjref.h5.xml_error.results
+more ..\..\temptest\tobjref.h5.xml_error.results >> ..\..\temptest\tobjref.h5.xml.results
+del ..\..\temptest\tobjref.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\topaque.h5 > ..\..\temptest\topaque.h5.xml.results 2>..\..\temptest\topaque.h5.xml_error.results
+more ..\..\temptest\topaque.h5.xml_error.results >> ..\..\temptest\topaque.h5.xml.results
+del ..\..\temptest\topaque.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tref-escapes-at.h5 > ..\..\temptest\tref-escapes-at.h5.xml.results 2>..\..\temptest\tref-escapes-at.h5.xml_error.results
+more ..\..\temptest\tref-escapes-at.h5.xml_error.results >> ..\..\temptest\tref-escapes-at.h5.xml.results
+del ..\..\temptest\tref-escapes-at.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tref-escapes.h5 > ..\..\temptest\tref-escapes.h5.xml.results 2>..\..\temptest\tref-escapes.h5.xml_error.results
+more ..\..\temptest\tref-escapes.h5.xml_error.results >> ..\..\temptest\tref-escapes.h5.xml.results
+del ..\..\temptest\tref-escapes.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tref.h5 > ..\..\temptest\tref.h5.xml.results 2>..\..\temptest\tref.h5.xml_error.results
+more ..\..\temptest\tref.h5.xml_error.results >> ..\..\temptest\tref.h5.xml.results
+del ..\..\temptest\tref.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tsaf.h5 > ..\..\temptest\tsaf.h5.xml.results 2>..\..\temptest\tsaf.h5.xml_error.results
+more ..\..\temptest\tsaf.h5.xml_error.results >> ..\..\temptest\tsaf.h5.xml.results
+del ..\..\temptest\tsaf.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tslink.h5 > ..\..\temptest\tslink.h5.xml.results 2>..\..\temptest\tslink.h5.xml_error.results
+more ..\..\temptest\tslink.h5.xml_error.results >> ..\..\temptest\tslink.h5.xml.results
+del ..\..\temptest\tslink.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tstr.h5 > ..\..\temptest\tstr.h5.xml.results 2>..\..\temptest\tstr.h5.xml_error.results
+more ..\..\temptest\tstr.h5.xml_error.results >> ..\..\temptest\tstr.h5.xml.results
+del ..\..\temptest\tstr.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tstr2.h5 > ..\..\temptest\tstr2.h5.xml.results 2>..\..\temptest\tstr2.h5.xml_error.results
+more ..\..\temptest\tstr2.h5.xml_error.results >> ..\..\temptest\tstr2.h5.xml.results
+del ..\..\temptest\tstr2.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tstring-at.h5 > ..\..\temptest\tstring-at.h5.xml.results 2>..\..\temptest\tstring-at.h5.xml_error.results
+more ..\..\temptest\tstring-at.h5.xml_error.results >> ..\..\temptest\tstring-at.h5.xml.results
+del ..\..\temptest\tstring-at.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tstring.h5 > ..\..\temptest\tstring.h5.xml.results 2>..\..\temptest\tstring.h5.xml_error.results
+more ..\..\temptest\tstring.h5.xml_error.results >> ..\..\temptest\tstring.h5.xml.results
+del ..\..\temptest\tstring.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tvldtypes1.h5 > ..\..\temptest\tvldtypes1.h5.xml.results 2>..\..\temptest\tvldtypes1.h5.xml_error.results
+more ..\..\temptest\tvldtypes1.h5.xml_error.results >> ..\..\temptest\tvldtypes1.h5.xml.results
+del ..\..\temptest\tvldtypes1.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tvldtypes2.h5 > ..\..\temptest\tvldtypes2.h5.xml.results 2>..\..\temptest\tvldtypes2.h5.xml_error.results
+more ..\..\temptest\tvldtypes2.h5.xml_error.results >> ..\..\temptest\tvldtypes2.h5.xml.results
+del ..\..\temptest\tvldtypes2.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tvldtypes3.h5 > ..\..\temptest\tvldtypes3.h5.xml.results 2>..\..\temptest\tvldtypes3.h5.xml_error.results
+more ..\..\temptest\tvldtypes3.h5.xml_error.results >> ..\..\temptest\tvldtypes3.h5.xml.results
+del ..\..\temptest\tvldtypes3.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tvldtypes4.h5 > ..\..\temptest\tvldtypes4.h5.xml.results 2>..\..\temptest\tvldtypes4.h5.xml_error.results
+more ..\..\temptest\tvldtypes4.h5.xml_error.results >> ..\..\temptest\tvldtypes4.h5.xml.results
+del ..\..\temptest\tvldtypes4.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tvldtypes5.h5 > ..\..\temptest\tvldtypes5.h5.xml.results 2>..\..\temptest\tvldtypes5.h5.xml_error.results
+more ..\..\temptest\tvldtypes5.h5.xml_error.results >> ..\..\temptest\tvldtypes5.h5.xml.results
+del ..\..\temptest\tvldtypes5.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tvlstr.h5 > ..\..\temptest\tvlstr.h5.xml.results 2>..\..\temptest\tvlstr.h5.xml_error.results
+more ..\..\temptest\tvlstr.h5.xml_error.results >> ..\..\temptest\tvlstr.h5.xml.results
+del ..\..\temptest\tvlstr.h5.xml_error.results
+
+h5dump%2 --xml ..\..\testfiles\tnamed_dtype_attr.h5 > ..\..\temptest\tnamed_dtype_attr.h5.xml.results 2>..\..\temptest\tnamed_dtype_attr.h5.xml_error.results
+more ..\..\temptest\tnamed_dtype_attr.h5.xml_error.results >> ..\..\temptest\tnamed_dtype_attr.h5.xml.results
+del ..\..\temptest\tnamed_dtype_attr.h5.xml_error.results
+
+h5dump%2 --xml --use-dtd ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty-dtd.h5.xml.results 2>..\..\temptest\tempty-dtd.h5.xml_error.results
+more ..\..\temptest\tempty-dtd.h5.xml_error.results >> ..\..\temptest\tempty-dtd.h5.xml.results
+del ..\..\temptest\tempty-dtd.h5.xml_error.results
+
+h5dump%2 --xml -u ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty-dtd-2.h5.xml.results 2>..\..\temptest\tempty-dtd-2.h5.xml_error.results
+more ..\..\temptest\tempty-dtd-2.h5.xml_error.results >> ..\..\temptest\tempty-dtd-2.h5.xml.results
+del ..\..\temptest\tempty-dtd-2.h5.xml_error.results
+
+h5dump%2 --xml -X ":" ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty-nons.h5.xml.results 2>..\..\temptest\tempty-nons.h5.xml_error.results
+more ..\..\temptest\tempty-nons.h5.xml_error.results >> ..\..\temptest\tempty-nons.h5.xml.results
+del ..\..\temptest\tempty-nons.h5.xml_error.results
+
+h5dump%2 --xml --xml-ns=":" ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty-nons-2.h5.xml.results 2>..\..\temptest\tempty-nons-2.h5.xml_error.results
+more ..\..\temptest\tempty-nons-2.h5.xml_error.results >> ..\..\temptest\tempty-nons-2.h5.xml.results
+del ..\..\temptest\tempty-nons-2.h5.xml_error.results
+
+h5dump%2 --xml -X "thing:" ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty-ns.h5.xml.results 2>..\..\temptest\tempty-ns.h5.xml_error.results
+more ..\..\temptest\tempty-ns.h5.xml_error.results >> ..\..\temptest\tempty-ns.h5.xml.results
+del ..\..\temptest\tempty-ns.h5.xml_error.results
+
+h5dump%2 --xml --xml-ns="thing:" ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty-ns-2.h5.xml.results 2>..\..\temptest\tempty-ns-2.h5.xml_error.results
+more ..\..\temptest\tempty-ns-2.h5.xml_error.results >> ..\..\temptest\tempty-ns-2.h5.xml.results
+del ..\..\temptest\tempty-ns-2.h5.xml_error.results
+
+h5dump%2 --xml --xml-ns=":" --xml-dtd="http://somewhere.net" ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty-nons-uri.h5.xml.results 2>..\..\temptest\tempty-nons-uri.h5.xml_error.results
+more ..\..\temptest\tempty-nons-uri.h5.xml_error.results >> ..\..\temptest\tempty-nons-uri.h5.xml.results
+del ..\..\temptest\tempty-nons-uri.h5.xml_error.results
+
+h5dump%2 --xml --use-dtd --xml-dtd="http://somewhere.net" ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty-dtd-uri.h5.xml.results 2>..\..\temptest\tempty-dtd-uri.h5.xml_error.results
+more ..\..\temptest\tempty-dtd-uri.h5.xml_error.results >> ..\..\temptest\tempty-dtd-uri.h5.xml.results
+del ..\..\temptest\tempty-dtd-uri.h5.xml_error.results
+
+h5dump%2 --xml -A ..\..\testfiles\tall.h5 > ..\..\temptest\tall-2A.h5.xml.results 2>..\..\temptest\tall-2A.h5.xml_error.results
+more ..\..\temptest\tall-2A.h5.xml_error.results >> ..\..\temptest\tall-2A.h5.xml.results
+del ..\..\temptest\tall-2A.h5.xml_error.results
+
+cd ..\..\temptest
+mkdir fctemp
+
+REM ##############################################################################
+REM ##############################################################################
+REM ###			                    T H E   T E S T S                             ###
+REM ##############################################################################
+REM ##############################################################################
+
+type nul > ..\dumptest%2_%1.txt
+echo ========================================== >> ..\dumptest%2_%1.txt
+echo Testing dumptest.bat >> ..\dumptest%2_%1.txt
+echo ========================================== >> ..\dumptest%2_%1.txt
+
+REM test for displaying groups
+call ..\deleteline tgroup-1.results 1 
+cd ..\testfiles
+call ..\deleteline tgroup-1.ddl 4
+cd ..\temptest\fctemp
+fc tgroup-1.ddl tgroup-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tgroup.h5                                               PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tgroup.h5                                               FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying the selected groups
+call ..\deleteline tgroup-2.results 1 
+cd ..\testfiles
+call ..\deleteline tgroup-2.ddl 4
+cd ..\temptest\fctemp
+fc tgroup-2.ddl tgroup-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -g /g2 -g / -g /y tgroup.h5                             PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -g /g2 -g / -g /y tgroup.h5                             FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying simple space datasets
+call ..\deleteline tdset-1.results 1 
+cd ..\testfiles
+call ..\deleteline tdset-1.ddl 4
+cd ..\temptest\fctemp
+fc tdset-1.ddl tdset-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tdset.h5                                                PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tdset.h5                                                FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying selected datasets
+call ..\deleteline tdset-2.results 1 
+cd ..\testfiles
+call ..\deleteline tdset-2.ddl 4
+cd ..\temptest\fctemp
+fc tdset-2.ddl tdset-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -H -d dset1 -d /dset2 --dataset=dset3                   PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -H -d dset1 -d /dset2 --dataset=dset3                   FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying attributes
+call ..\deleteline tattr-1.results 1 
+cd ..\testfiles
+call ..\deleteline tattr-1.ddl 4
+cd ..\temptest\fctemp
+fc tattr-1.ddl tattr-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tattr.h5                                                PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tattr.h5                                                FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying the selected attributes of string type and scalar space
+call ..\deleteline tattr-2.results 1 
+cd ..\testfiles
+call ..\deleteline tattr-2.ddl 4
+cd ..\temptest\fctemp
+fc tattr-2.ddl tattr-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -a /attr1 --attribute /attr4 --attribute=/attr5 tattr.  PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -a /attr1 --attribute /attr4 --attribute=/attr5 tattr.  FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for header and error messages
+call ..\deleteline tattr-3.results 1 
+cd ..\testfiles
+call ..\deleteline tattr-3.ddl 4
+cd ..\temptest\fctemp
+fc tattr-3.ddl tattr-3.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --header -a /attr2 --attribute=/attr tattr.h5           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --header -a /attr2 --attribute=/attr tattr.h5           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying shared datatype in attribute
+call ..\deleteline tnamed_dtype_attr.results 1 
+cd ..\testfiles
+call ..\deleteline tnamed_dtype_attr.ddl 4
+cd ..\temptest\fctemp
+fc tnamed_dtype_attr.ddl tnamed_dtype_attr.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -A tnamed_dtype_attr.h5 tnamed_dtype_attr.results       PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -A tnamed_dtype_attr.h5 tnamed_dtype_attr.results       FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying soft links
+call ..\deleteline tslink-1.results 1 
+cd ..\testfiles
+call ..\deleteline tslink-1.ddl 4
+cd ..\temptest\fctemp
+fc tslink-1.ddl tslink-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tslink.h5                                               PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tslink.h5                                               FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying the selected link
+call ..\deleteline tslink-2.results 1 
+cd ..\testfiles
+call ..\deleteline tslink-2.ddl 4
+cd ..\temptest\fctemp
+fc tslink-2.ddl tslink-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -l slink2 tslink.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -l slink2 tslink.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM tests for hard links
+call ..\deleteline thlink-1.results 1 
+cd ..\testfiles
+call ..\deleteline thlink-1.ddl 4
+cd ..\temptest\fctemp
+fc thlink-1.ddl thlink-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump thlink.h5                                               PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump thlink.h5                                               FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline thlink-2.results 1 
+cd ..\testfiles
+call ..\deleteline thlink-2.ddl 4
+cd ..\temptest\fctemp
+fc thlink-2.ddl thlink-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3  PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3  FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline thlink-3.results 1 
+cd ..\testfiles
+call ..\deleteline thlink-3.ddl 4
+cd ..\temptest\fctemp
+fc thlink-3.ddl thlink-3.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1  PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1  FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline thlink-4.results 1 
+cd ..\testfiles
+call ..\deleteline thlink-4.ddl 4
+cd ..\temptest\fctemp
+fc thlink-4.ddl thlink-4.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -g /g1 thlink.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -g /g1 thlink.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline thlink-5.results 1 
+cd ..\testfiles
+call ..\deleteline thlink-5.ddl 4
+cd ..\temptest\fctemp
+fc thlink-5.ddl thlink-5.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -d /dset1 -g /g2 -d /g1/dset2 thlink.h5                 PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -d /dset1 -g /g2 -d /g1/dset2 thlink.h5                 FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM tests for compound data types
+call ..\deleteline tcomp-1.results 1 
+cd ..\testfiles
+call ..\deleteline tcomp-1.ddl 4
+cd ..\temptest\fctemp
+fc tcomp-1.ddl tcomp-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tcompound.h5                                            PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tcompound.h5                                            FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for named data types
+call ..\deleteline tcomp-2.results 1 
+cd ..\testfiles
+call ..\deleteline tcomp-2.ddl 4
+cd ..\temptest\fctemp
+fc tcomp-2.ddl tcomp-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -t /type1 --datatype /type2 --datatype=/group1/type3    PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -t /type1 --datatype /type2 --datatype=/group1/type3    FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for unamed type 
+call ..\deleteline tcomp-3.results 1 
+cd ..\testfiles
+call ..\deleteline tcomp-3.ddl 4
+cd ..\temptest\fctemp
+fc tcomp-3.ddl tcomp-3.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -t /#6632:0 -g /group2 tcompound.h5                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -t /#6632:0 -g /group2 tcompound.h5                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test complicated compound datatype
+call ..\deleteline tcompound_complex.results 1 
+cd ..\testfiles
+call ..\deleteline tcomp-4.ddl 4
+cd ..\temptest\fctemp
+fc tcomp-4.ddl tcompound_complex.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tcompound_complex.h5                                    PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tcompound_complex.h5                                    FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for the nested compound type
+call ..\deleteline tnestcomp-1.results 1 
+cd ..\testfiles
+call ..\deleteline tnestcomp-1.ddl 4
+cd ..\temptest\fctemp
+fc tnestcomp-1.ddl tnestcomp-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tnestedcomp.h5                                          PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tnestedcomp.h5                                          FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for options
+call ..\deleteline tall-1.results 1 
+cd ..\testfiles
+call ..\deleteline tall-1.ddl 4
+cd ..\temptest\fctemp
+fc tall-1.ddl tall-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tall.h5                                                 PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tall.h5                                                 FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tall-2.results 1 
+cd ..\testfiles
+call ..\deleteline tall-2.ddl 4
+cd ..\temptest\fctemp
+fc tall-2.ddl tall-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --header -g /g1/g1.1 -a attr2 tall.h5                   PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --header -g /g1/g1.1 -a attr2 tall.h5                   FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tall-3.results 1 
+cd ..\testfiles
+call ..\deleteline tall-3.ddl 4
+cd ..\temptest\fctemp
+fc tall-3.ddl tall-3.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for loop detection
+call ..\deleteline tloop-1.results 1 
+cd ..\testfiles
+call ..\deleteline tloop-1.ddl 4
+cd ..\temptest\fctemp
+fc tloop-1.ddl tloop-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tloop.h5                                                PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tloop.h5                                                FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for string 
+call ..\deleteline tstr-1.results 1 
+cd ..\testfiles
+call ..\deleteline tstr-1.ddl 4
+cd ..\temptest\fctemp
+fc tstr-1.ddl tstr-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tstr.h5                                                 PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tstr.h5                                                 FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tstr-2.results 1 
+cd ..\testfiles
+call ..\deleteline tstr-2.ddl 4
+cd ..\temptest\fctemp
+fc tstr-2.ddl tstr-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tstr2.h5                                                PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tstr2.h5                                                FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for file created by Lib SAF team
+call ..\deleteline tsaf.results 1 
+cd ..\testfiles
+call ..\deleteline tsaf.ddl 4
+cd ..\temptest\fctemp
+fc tsaf.ddl tsaf.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tsaf.h5                                                 PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tsaf.h5                                                 FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for file with variable length data
+call ..\deleteline tvldtypes1.results 1 
+cd ..\testfiles
+call ..\deleteline tvldtypes1.ddl 4
+cd ..\temptest\fctemp
+fc tvldtypes1.ddl tvldtypes1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tvldtypes1.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tvldtypes1.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tvldtypes2.results 1 
+cd ..\testfiles
+call ..\deleteline tvldtypes2.ddl 4
+cd ..\temptest\fctemp
+fc tvldtypes2.ddl tvldtypes2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tvldtypes2.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tvldtypes2.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tvldtypes3.results 1 
+cd ..\testfiles
+call ..\deleteline tvldtypes3.ddl 4
+cd ..\temptest\fctemp
+fc tvldtypes3.ddl tvldtypes3.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tvldtypes3.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tvldtypes3.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tvldtypes4.results 1 
+cd ..\testfiles
+call ..\deleteline tvldtypes4.ddl 4
+cd ..\temptest\fctemp
+fc tvldtypes4.ddl tvldtypes4.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tvldtypes4.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tvldtypes4.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tvldtypes5.results 1 
+cd ..\testfiles
+call ..\deleteline tvldtypes5.ddl 4
+cd ..\temptest\fctemp
+fc tvldtypes5.ddl tvldtypes5.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tvldtypes5.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tvldtypes5.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for file with variable length string data
+call ..\deleteline tvlstr.results 1 
+cd ..\testfiles
+call ..\deleteline tvlstr.ddl 4
+cd ..\temptest\fctemp
+fc tvlstr.ddl tvlstr.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tvlstr.h5                                               PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tvlstr.h5                                               FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for files with array data
+call ..\deleteline tarray1.results 1 
+cd ..\testfiles
+call ..\deleteline tarray1.ddl 4
+cd ..\temptest\fctemp
+fc tarray1.ddl tarray1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tarray1.h5                                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tarray1.h5                                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tarray2.results 1 
+cd ..\testfiles
+call ..\deleteline tarray2.ddl 4
+cd ..\temptest\fctemp
+fc tarray2.ddl tarray2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tarray2.h5                                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tarray2.h5                                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tarray3.results 1 
+cd ..\testfiles
+call ..\deleteline tarray3.ddl 4
+cd ..\temptest\fctemp
+fc tarray3.ddl tarray3.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tarray3.h5                                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tarray3.h5                                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tarray4.results 1 
+cd ..\testfiles
+call ..\deleteline tarray4.ddl 4
+cd ..\temptest\fctemp
+fc tarray4.ddl tarray4.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tarray4.h5                                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tarray4.h5                                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tarray5.results 1 
+cd ..\testfiles
+call ..\deleteline tarray5.ddl 4
+cd ..\temptest\fctemp
+fc tarray5.ddl tarray5.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tarray5.h5                                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tarray5.h5                                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tarray6.results 1 
+cd ..\testfiles
+call ..\deleteline tarray6.ddl 4
+cd ..\temptest\fctemp
+fc tarray6.ddl tarray6.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tarray6.h5                                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tarray6.h5                                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tarray7.results 1 
+cd ..\testfiles
+call ..\deleteline tarray7.ddl 4
+cd ..\temptest\fctemp
+fc tarray7.ddl tarray7.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tarray7.h5                                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tarray7.h5                                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for files with empty data
+call ..\deleteline tempty.results 1 
+cd ..\testfiles
+call ..\deleteline tempty.ddl 4
+cd ..\temptest\fctemp
+fc tempty.ddl tempty.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tempty.h5                                               PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tempty.h5                                               FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for files with groups that have comments
+call ..\deleteline tgrp_comments.results 1 
+cd ..\testfiles
+call ..\deleteline tgrp_comments.ddl 4
+cd ..\temptest\fctemp
+fc tgrp_comments.ddl tgrp_comments.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tgrp_comments.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tgrp_comments.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test the --filedriver flag
+call ..\deleteline tsplit_file.results 1 
+cd ..\testfiles
+call ..\deleteline tsplit_file.ddl 4
+cd ..\temptest\fctemp
+fc tsplit_file.ddl tsplit_file.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --filedriver=split tsplit_file                          PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --filedriver=split tsplit_file                          FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tfamily.ddl --filedriver=family tfamily%05d.h5
+REM call ..\deleteline tfamily.results 1 
+REM cd ..\testfiles
+REM call ..\deleteline tfamily.ddl 4
+REM cd ..\temptest\fctemp
+REM fc tfamily.ddl tfamily.results >temp.txt
+REM cd ..
+
+call ..\deleteline tmulti.results 1 
+cd ..\testfiles
+call ..\deleteline tmulti.ddl 4
+cd ..\temptest\fctemp
+fc tmulti.ddl tmulti.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tmulti                                                  PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tmulti                                                  FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for files with group names which reach > 1024 bytes in size
+call ..\deleteline tlarge_objname.results 1 
+cd ..\testfiles
+call ..\deleteline tlarge_objname.ddl 4
+cd ..\temptest\fctemp
+fc tlarge_objname.ddl tlarge_objname.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -w157 tlarge_objname.h5                                 PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -w157 tlarge_objname.h5                                 FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test '-A' to suppress data but print attr's
+call ..\deleteline tall-2A.results 1 
+cd ..\testfiles
+call ..\deleteline tall-2A.ddl 4
+cd ..\temptest\fctemp
+fc tall-2A.ddl tall-2A.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -A tall.h5                                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -A tall.h5                                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test Subsetting
+call ..\deleteline tall-4s.results 1 
+cd ..\testfiles
+call ..\deleteline tall-4s.ddl 4
+cd ..\temptest\fctemp
+fc tall-4s.ddl tall-4s.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3   PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3   FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tall-5s.results 1 
+cd ..\testfiles
+call ..\deleteline tall-5s.ddl 4
+cd ..\temptest\fctemp
+fc tall-5s.ddl tall-5s.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5                PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -d "/g1/g1.1/dset1.1.2[0;2;10;]" tall.h5                FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tdset-3s.results 1 
+cd ..\testfiles
+call ..\deleteline tdset-3s.ddl 4
+cd ..\temptest\fctemp
+fc tdset-3s.ddl tdset-3s.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -d "/dset1[1,1;;;]" tdset.h5                            PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -d "/dset1[1,1;;;]" tdset.h5                            FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tdset2-1s.results 1 
+cd ..\testfiles
+call ..\deleteline tdset2-1s.ddl 4
+cd ..\temptest\fctemp
+fc tdset2-1s.ddl tdset2-1s.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -d "/dset1[;3,2;4,4;1,4]" tdset2.h5                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -d "/dset1[;3,2;4,4;1,4]" tdset2.h5                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test printing characters in ASCII instead of decimal
+call ..\deleteline tchar1.results 1 
+cd ..\testfiles
+call ..\deleteline tchar1.ddl 4
+cd ..\temptest\fctemp
+fc tchar1.ddl tchar1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -r tchar.h5                                             PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -r tchar.h5                                             FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test failure handling
+REM Missing file name
+call ..\deleteline tnofilename.results 0 
+cd ..\testfiles
+call ..\deleteline tnofilename.ddl 3
+cd ..\temptest\fctemp
+fc tnofilename.ddl tnofilename.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump                                                         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump                                                         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM rev. 2004
+
+REM tests for super block
+REM TOOLTEST tboot1.ddl -H -B -d dset tfcontents1.h5
+call ..\deleteline tboot1.results 1 
+cd ..\testfiles
+call ..\deleteline tboot1.ddl 4
+cd ..\temptest\fctemp
+fc tboot1.ddl tboot1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -H -B -d dset tfcontents1.h5                            PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -H -B -d dset tfcontents1.h5                            FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tboot2.ddl -B tfcontents2.h5
+call ..\deleteline tboot2.results 1 
+cd ..\testfiles
+call ..\deleteline tboot2.ddl 4
+cd ..\temptest\fctemp
+fc tboot2.ddl tboot2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -B tfcontents2.h5                                       PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -B tfcontents2.h5                                       FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test -p with a non existing dataset
+REM TOOLTEST tperror.ddl -p -d bogus tfcontents1.h5
+call ..\deleteline tperror.results 1 
+cd ..\testfiles
+call ..\deleteline tperror.ddl 4
+cd ..\temptest\fctemp
+fc tperror.ddl tperror.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -p -d bogus tfcontents1.h5                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -p -d bogus tfcontents1.h5                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for file contents
+REM TOOLTEST tcontents.ddl -n tfcontents1.h5
+call ..\deleteline tcontents.results 1 
+cd ..\testfiles
+call ..\deleteline tcontents.ddl 4
+cd ..\temptest\fctemp
+fc tcontents.ddl tcontents.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -n tfcontents1.h5                                       PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -n tfcontents1.h5                                       FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM tests for storage layout
+REM compact
+REM TOOLTEST tcompact.ddl -H -p -d compact tfilters.h5
+call ..\deleteline tcompact.results 1 
+cd ..\testfiles
+call ..\deleteline tcompact.ddl 4
+cd ..\temptest\fctemp
+fc tcompact.ddl tcompact.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -H -p -d compact tfilters.h5                            PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -H -p -d compact tfilters.h5                            FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM contiguous
+REM TOOLTEST tcontiguos.ddl -H -p -d contiguous tfilters.h5
+call ..\deleteline tcontiguos.results 1 
+cd ..\testfiles
+call ..\deleteline tcontiguos.ddl 4
+cd ..\temptest\fctemp
+fc tcontiguos.ddl tcontiguos.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -H -p -d contiguous tfilters.h5                         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -H -p -d contiguous tfilters.h5                         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM chunked
+REM TOOLTEST tchunked.ddl -H -p -d chunked tfilters.h5
+call ..\deleteline tchunked.results 1 
+cd ..\testfiles
+call ..\deleteline tchunked.ddl 4
+cd ..\temptest\fctemp
+fc tchunked.ddl tchunked.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -H -p -d chunked tfilters.h5                            PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -H -p -d chunked tfilters.h5                            FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM external 
+REM TOOLTEST texternal.ddl -H -p -d external tfilters.h5
+call ..\deleteline texternal.results 1 
+cd ..\testfiles
+call ..\deleteline texternal.ddl 4
+cd ..\temptest\fctemp
+fc texternal.ddl texternal.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -H -p -d external tfilters.h5                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -H -p -d external tfilters.h5                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM fill values
+REM TOOLTEST tfill.ddl -p tfvalues.h5
+call ..\deleteline tfill.results 1 
+cd ..\testfiles
+call ..\deleteline tfill.ddl 4
+cd ..\temptest\fctemp
+fc tfill.ddl tfill.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -p tfvalues.h5                                          PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -p tfvalues.h5                                          FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM several datatype, with references , print path
+REM TOOLTEST treference.ddl  tattr2.h5
+call ..\deleteline treference.results 1 
+cd ..\testfiles
+call ..\deleteline treference.ddl 4
+cd ..\temptest\fctemp
+fc treference.ddl treference.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tattr2.h5                                               PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tattr2.h5                                               FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM escape/not escape non printable characters
+REM TOOLTEST tstringe.ddl -e tstr3.h5
+call ..\deleteline tstringe.results 1 
+cd ..\testfiles
+call ..\deleteline tstringe.ddl 4
+cd ..\temptest\fctemp
+fc tstringe.ddl tstringe.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -e tstr3.h5                                             PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -e tstr3.h5                                             FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tstring.ddl tstr3.h5
+call ..\deleteline tstring.results 1 
+cd ..\testfiles
+call ..\deleteline tstring.ddl 4
+cd ..\temptest\fctemp
+fc tstring.ddl tstring.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tstr3.h5                                                PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tstr3.h5                                                FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM char data as ASCII with non escape
+REM TOOLTEST tstring2.ddl -r -d str4 tstr3.h5
+call ..\deleteline tstring2.results 1 
+cd ..\testfiles
+call ..\deleteline tstring2.ddl 4
+cd ..\temptest\fctemp
+fc tstring2.ddl tstring2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -r -d str4 tstr3.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -r -d str4 tstr3.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM array indices print/not print
+REM TOOLTEST tindicesyes.ddl taindices.h5
+call ..\deleteline tindicesyes.results 1 
+cd ..\testfiles
+call ..\deleteline tindicesyes.ddl 4
+cd ..\temptest\fctemp
+fc tindicesyes.ddl tindicesyes.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump taindices.h5                                            PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump taindices.h5                                            FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tindicesno.ddl -y taindices.h5
+call ..\deleteline tindicesno.results 1 
+cd ..\testfiles
+call ..\deleteline tindicesno.ddl 4
+cd ..\temptest\fctemp
+fc tindicesno.ddl tindicesno.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -y taindices.h5                                         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -y taindices.h5                                         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM tests for filters
+REM SZIP
+REM TOOLTEST tszip.ddl -H -p -d szip tfilters.h5
+if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP4
+if %HDF5_EXT_SZIP%==szlib.lib (
+      call ..\deleteline tszip.results 1 
+      cd ..\testfiles
+      call ..\deleteline tszip.ddl 4
+      cd ..\temptest\fctemp
+      fc tszip.ddl tszip.results >temp.txt
+      if %ERRORLEVEL%==0 (
+         echo Testing h5dump -H -p -d szip tfilters.h5                               PASSED >> ..\..\dumptest%2_%1.txt
+      ) else (
+         echo Testing h5dump -H -p -d szip tfilters.h5                               FAILED >> ..\..\dumptest%2_%1.txt
+         more temp.txt >> ..\..\dumptest%2_%1.txt
+      )
+      del temp.txt
+      cd ..
+      GOTO NEXTSTEP5
+) else (
+   echo Testing h5dump -H -p -d szip tfilters.h5                               -SKIP- >> ..\..\dumptest%2_%1.txt
+   GOTO NEXTSTEP5
+)
+
+:NEXTSTEP4
+echo Testing h5dump -H -p -d szip tfilters.h5                               -SKIP- >> ..\dumptest%2_%1.txt
+
+:NEXTSTEP5
+
+
+REM deflate
+REM TOOLTEST tdeflate.ddl -H -p -d deflate tfilters.h5
+if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP6
+if %HDF5_EXT_ZLIB%==zlib.lib (
+   call ..\deleteline tdeflate.results 1 
+   cd ..\testfiles
+   call ..\deleteline tdeflate.ddl 4
+   cd ..\temptest\fctemp
+   fc tdeflate.ddl tdeflate.results >temp.txt
+   if %ERRORLEVEL%==0 (
+      echo Testing h5dump -H -p -d deflate tfilters.h5                            PASSED >> ..\..\dumptest%2_%1.txt
+   ) else (
+      echo Testing h5dump -H -p -d deflate tfilters.h5                            FAILED >> ..\..\dumptest%2_%1.txt
+      more temp.txt >> ..\..\dumptest%2_%1.txt
+   )
+   del temp.txt
+   cd ..
+   GOTO NEXTSTEP7
+) else (
+   echo Testing h5dump -H -p -d deflate tfilters.h5                            -SKIP- >> ..\..\dumptest%2_%1.txt
+   GOTO NEXTSTEP7
+)
+
+:NEXTSTEP6
+echo Testing h5dump -H -p -d deflate tfilters.h5                            -SKIP- >> ..\dumptest%2_%1.txt
+
+:NEXTSTEP7
+
+REM shuffle
+REM TOOLTEST tshuffle.ddl -H -p -d shuffle tfilters.h5
+call ..\deleteline tshuffle.results 1 
+cd ..\testfiles
+call ..\deleteline tshuffle.ddl 4
+cd ..\temptest\fctemp
+fc tshuffle.ddl tshuffle.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -H -p -d shuffle tfilters.h5                            PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -H -p -d shuffle tfilters.h5                            FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM fletcher32
+REM TOOLTEST tfletcher32.ddl -H -p -d fletcher32  tfilters.h5
+call ..\deleteline tfletcher32.results 1 
+cd ..\testfiles
+call ..\deleteline tfletcher32.ddl 4
+cd ..\temptest\fctemp
+fc tfletcher32.ddl tfletcher32.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -H -p -d fletcher32  tfilters.h5                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -H -p -d fletcher32  tfilters.h5                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM all
+REM TOOLTEST tallfilters.ddl -H -p -d all  tfilters.h5
+if "%HDF5_EXT_ZLIB%"=="" GOTO NEXTSTEP8
+if "%HDF5_EXT_SZIP%"=="" GOTO NEXTSTEP8
+if %HDF5_EXT_ZLIB%==zlib.lib (
+   if %HDF5_EXT_SZIP%==szlib.lib (
+      call ..\deleteline tallfilters.results 1 
+      cd ..\testfiles
+      call ..\deleteline tallfilters.ddl 4
+      cd ..\temptest\fctemp
+      fc tallfilters.ddl tallfilters.results >temp.txt
+      if %ERRORLEVEL%==0 (
+         echo Testing h5dump -H -p -d all tfilters.h5                                PASSED >> ..\..\dumptest%2_%1.txt
+      ) else (
+         echo Testing h5dump -H -p -d all tfilters.h5                                FAILED >> ..\..\dumptest%2_%1.txt
+         more temp.txt >> ..\..\dumptest%2_%1.txt
+      )
+      del temp.txt
+      cd ..
+      GOTO NEXTSTEP9
+   ) else (
+      echo Testing h5dump -H -p -d all tfilters.h5                                -SKIP- >> ..\..\dumptest%2_%1.txt
+      GOTO NEXTSTEP9
+   )
+) else (
+   echo Testing h5dump -H -p -d all tfilters.h5                                -SKIP- >> ..\..\dumptest%2_%1.txt
+   GOTO NEXTSTEP9
+)
+
+
+:NEXTSTEP8
+echo Testing h5dump -H -p -d all tfilters.h5                                -SKIP- >> ..\dumptest%2_%1.txt
+
+:NEXTSTEP9
+
+REM user defined
+REM TOOLTEST tuserfilter.ddl -H  -p -d myfilter  tfilters.h5
+call ..\deleteline tuserfilter.results 1 
+cd ..\testfiles
+call ..\deleteline tuserfilter.ddl 4
+cd ..\temptest\fctemp
+fc tuserfilter.ddl tuserfilter.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump -H -p -d myfilter tfilters.h5                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump -H -p -d myfilter tfilters.h5                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd .. 
+
+REM test for displaying dataset and attribute of null space
+REM TOOLTEST tnullspace.ddl tnullspace.h5
+call ..\deleteline tnullspace.results 1 
+cd ..\testfiles
+call ..\deleteline tnullspace.ddl 4
+cd ..\temptest\fctemp
+fc tnullspace.ddl tnullspace.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump tnullspace.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump tnullspace.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test XML
+REM TOOLTEST tall.h5.xml --xml tall.h5
+call ..\deleteline tall.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tall.h5.xml 3
+cd ..\temptest\fctemp
+fc tall.h5.xml tall.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tall.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tall.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tattr.h5.xml --xml tattr.h5
+call ..\deleteline tattr.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tattr.h5.xml 3
+cd ..\temptest\fctemp
+fc tattr.h5.xml tattr.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tattr.h5                                          PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tattr.h5                                          FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tbitfields.h5.xml --xml tbitfields.h5
+call ..\deleteline tbitfields.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tbitfields.h5.xml 3
+cd ..\temptest\fctemp
+fc tbitfields.h5.xml tbitfields.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tbitfields.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tbitfields.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tcompound.h5.xml --xml tcompound.h5
+call ..\deleteline tcompound.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tcompound.h5.xml 3
+cd ..\temptest\fctemp
+fc tcompound.h5.xml tcompound.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tcompound.h5                                      PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tcompound.h5                                      FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tcompound2.h5.xml --xml tcompound2.h5
+call ..\deleteline tcompound2.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tcompound2.h5.xml 3
+cd ..\temptest\fctemp
+fc tcompound2.h5.xml tcompound2.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tcompound2.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tcompound2.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tdatareg.h5.xml --xml tdatareg.h5
+call ..\deleteline tdatareg.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tdatareg.h5.xml 3
+cd ..\temptest\fctemp
+fc tdatareg.h5.xml tdatareg.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tdatareg.h5                                       PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tdatareg.h5                                       FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tdset.h5.xml --xml tdset.h5
+call ..\deleteline tdset.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tdset.h5.xml 3
+cd ..\temptest\fctemp
+fc tdset.h5.xml tdset.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tdset.h5                                          PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tdset.h5                                          FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tdset2.h5.xml --xml tdset2.h5
+call ..\deleteline tdset2.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tdset2.h5.xml 3
+cd ..\temptest\fctemp
+fc tdset2.h5.xml tdset2.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tdset2.h5                                         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tdset2.h5                                         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tenum.h5.xml --xml tenum.h5
+call ..\deleteline tenum.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tenum.h5.xml 3
+cd ..\temptest\fctemp
+fc tenum.h5.xml tenum.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tenum.h5                                          PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tenum.h5                                          FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tgroup.h5.xml --xml tgroup.h5
+call ..\deleteline tgroup.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tgroup.h5.xml 3
+cd ..\temptest\fctemp
+fc tgroup.h5.xml tgroup.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tgroup.h5                                         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tgroup.h5                                         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST thlink.h5.xml --xml thlink.h5
+REM call ..\deleteline thlink.h5.xml.results 0 
+REM cd ..\testfiles
+REM call ..\deleteline thlink.h5.xml 3
+REM cd ..\temptest\fctemp
+REM fc thlink.h5.xml thlink.h5.xml.results >temp.txt
+REM if %ERRORLEVEL%==0 (
+REM   echo Testing h5dump --xml thlink.h5                                      PASSED >> ..\..\dumptest%2_%1.txt
+REM ) else (
+REM    echo Testing h5dump --xml thlink.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+REM    more temp.txt >> ..\..\dumptest%2_%1.txt
+REM )
+REM del temp.txt
+REM cd ..
+REM TOOLTEST tloop.h5.xml --xml tloop.h5
+call ..\deleteline tloop.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tloop.h5.xml 3
+cd ..\temptest\fctemp
+fc tloop.h5.xml tloop.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tloop.h5                                          PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tloop.h5                                          FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tloop2.h5.xml --xml tloop2.h5
+call ..\deleteline tloop2.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tloop2.h5.xml 3
+cd ..\temptest\fctemp
+fc tloop2.h5.xml tloop2.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tloop2.h5                                         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tloop2.h5                                         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tmany.h5.xml --xml tmany.h5
+REM call ..\deleteline tmany.h5.xml.results 0 
+REM cd ..\testfiles
+REM call ..\deleteline tmany.h5.xml 3
+REM cd ..\temptest\fctemp
+REM fc tmany.h5.xml tmany.h5.xml.results >temp.txt
+REM if %ERRORLEVEL%==0 (
+REM    echo Testing h5dump --xml tmany.h5                                      PASSED >> ..\..\dumptest%2_%1.txt
+REM ) else (
+REM    echo Testing h5dump --xml tmany.h5                                      FAILED >> ..\..\dumptest%2_%1.txt
+REM    more temp.txt >> ..\..\dumptest%2_%1.txt
+REM )
+REM del temp.txt
+REM cd ..
+REM TOOLTEST tnestedcomp.h5.xml --xml tnestedcomp.h5
+call ..\deleteline tnestedcomp.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tnestedcomp.h5.xml 3
+cd ..\temptest\fctemp
+fc tnestedcomp.h5.xml tnestedcomp.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tnestedcomp.h5                                    PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tnestedcomp.h5                                    FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tcompound_complex.h5.xml --xml tcompound_complex.h5
+call ..\deleteline tcompound_complex.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tcompound_complex.h5.xml 3
+cd ..\temptest\fctemp
+fc tcompound_complex.h5.xml tcompound_complex.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tcompound_complex.h5                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tcompound_complex.h5                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tobjref.h5.xml --xml tobjref.h5
+call ..\deleteline tobjref.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tobjref.h5.xml 3
+cd ..\temptest\fctemp
+fc tobjref.h5.xml tobjref.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tobjref.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tobjref.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST topaque.h5.xml --xml topaque.h5
+call ..\deleteline topaque.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline topaque.h5.xml 3
+cd ..\temptest\fctemp
+fc topaque.h5.xml topaque.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml topaque.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml topaque.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tslink.h5.xml --xml tslink.h5
+call ..\deleteline tslink.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tslink.h5.xml 3
+cd ..\temptest\fctemp
+fc tslink.h5.xml tslink.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tslink.h5                                         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tslink.h5                                         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tstr.h5.xml --xml tstr.h5
+call ..\deleteline tstr.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tstr.h5.xml 3
+cd ..\temptest\fctemp
+fc tstr.h5.xml tstr.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tstr.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tstr.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tstr2.h5.xml --xml tstr2.h5
+call ..\deleteline tstr2.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tstr2.h5.xml 3
+cd ..\temptest\fctemp
+fc tstr2.h5.xml tstr2.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tstr2.h5                                          PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tstr2.h5                                          FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tref.h5.xml --xml tref.h5
+call ..\deleteline tref.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tref.h5.xml 3
+cd ..\temptest\fctemp
+fc tref.h5.xml tref.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tref.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tref.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tname-amp.h5.xml --xml tname-amp.h5
+call ..\deleteline tname-amp.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tname-amp.h5.xml 3
+cd ..\temptest\fctemp
+fc tname-amp.h5.xml tname-amp.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tname-amp.h5                                      PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tname-amp.h5                                      FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tname-apos.h5.xml --xml tname-apos.h5
+call ..\deleteline tname-apos.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tname-apos.h5.xml 3
+cd ..\temptest\fctemp
+fc tname-apos.h5.xml tname-apos.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tname-apos.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tname-apos.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tname-gt.h5.xml --xml tname-gt.h5
+call ..\deleteline tname-gt.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tname-gt.h5.xml 3
+cd ..\temptest\fctemp
+fc tname-gt.h5.xml tname-gt.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tname-gt.h5                                       PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tname-gt.h5                                       FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tname-lt.h5.xml --xml tname-lt.h5
+call ..\deleteline tname-lt.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tname-lt.h5.xml 3
+cd ..\temptest\fctemp
+fc tname-lt.h5.xml tname-lt.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tname-lt.h5                                       PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tname-lt.h5                                       FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tname-quot.h5.xml --xml tname-quot.h5
+call ..\deleteline tname-quot.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tname-quot.h5.xml 3
+cd ..\temptest\fctemp
+fc tname-quot.h5.xml tname-quot.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tname-quot.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tname-quot.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tname-sp.h5.xml --xml tname-sp.h5
+call ..\deleteline tname-sp.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tname-sp.h5.xml 3
+cd ..\temptest\fctemp
+fc tname-sp.h5.xml tname-sp.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tname-sp.h5                                       PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tname-sp.h5                                       FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tstring.h5.xml --xml tstring.h5
+call ..\deleteline tstring.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tstring.h5.xml 3
+cd ..\temptest\fctemp
+fc tstring.h5.xml tstring.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tstring.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tstring.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tstring-at.h5.xml --xml tstring-at.h5
+call ..\deleteline tstring-at.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tstring-at.h5.xml 3
+cd ..\temptest\fctemp
+fc tstring-at.h5.xml tstring-at.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tstring-at.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tstring-at.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tref-escapes.h5.xml --xml tref-escapes.h5
+call ..\deleteline tref-escapes.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tref-escapes.h5.xml 3
+cd ..\temptest\fctemp
+fc tref-escapes.h5.xml tref-escapes.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tref-escapes.h5                                   PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tref-escapes.h5                                   FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tref-escapes-at.h5.xml --xml tref-escapes-at.h5
+call ..\deleteline tref-escapes-at.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tref-escapes-at.h5.xml 3
+cd ..\temptest\fctemp
+fc tref-escapes-at.h5.xml tref-escapes-at.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tref-escapes-at.h5                                PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tref-escapes-at.h5                                FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tnodata.h5.xml --xml tnodata.h5
+call ..\deleteline tnodata.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tnodata.h5.xml 3
+cd ..\temptest\fctemp
+fc tnodata.h5.xml tnodata.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tnodata.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tnodata.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tarray1.h5.xml --xml tarray1.h5
+call ..\deleteline tarray1.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tarray1.h5.xml 3
+cd ..\temptest\fctemp
+fc tarray1.h5.xml tarray1.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tarray1.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tarray1.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tarray2.h5.xml --xml tarray2.h5
+call ..\deleteline tarray2.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tarray2.h5.xml 3
+cd ..\temptest\fctemp
+fc tarray2.h5.xml tarray2.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tarray2.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tarray2.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tarray3.h5.xml --xml tarray3.h5
+call ..\deleteline tarray3.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tarray3.h5.xml 3
+cd ..\temptest\fctemp
+fc tarray3.h5.xml tarray3.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tarray3.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tarray3.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tarray6.h5.xml --xml tarray6.h5
+call ..\deleteline tarray6.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tarray6.h5.xml 3
+cd ..\temptest\fctemp
+fc tarray6.h5.xml tarray6.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tarray6.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tarray6.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tarray7.h5.xml --xml tarray7.h5
+call ..\deleteline tarray7.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tarray7.h5.xml 3
+cd ..\temptest\fctemp
+fc tarray7.h5.xml tarray7.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tarray7.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tarray7.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tvldtypes1.h5.xml --xml tvldtypes1.h5
+call ..\deleteline tvldtypes1.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tvldtypes1.h5.xml 3
+cd ..\temptest\fctemp
+fc tvldtypes1.h5.xml tvldtypes1.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tvldtypes1.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tvldtypes1.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tvldtypes2.h5.xml --xml tvldtypes2.h5
+call ..\deleteline tvldtypes2.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tvldtypes2.h5.xml 3
+cd ..\temptest\fctemp
+fc tvldtypes2.h5.xml tvldtypes2.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tvldtypes2.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tvldtypes2.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tvldtypes3.h5.xml --xml tvldtypes3.h5
+call ..\deleteline tvldtypes3.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tvldtypes3.h5.xml 3
+cd ..\temptest\fctemp
+fc tvldtypes3.h5.xml tvldtypes3.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tvldtypes3.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tvldtypes3.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tvldtypes4.h5.xml --xml tvldtypes4.h5
+call ..\deleteline tvldtypes4.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tvldtypes4.h5.xml 3
+cd ..\temptest\fctemp
+fc tvldtypes4.h5.xml tvldtypes4.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tvldtypes4.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tvldtypes4.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tvldtypes5.h5.xml --xml tvldtypes5.h5
+call ..\deleteline tvldtypes5.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tvldtypes5.h5.xml 3
+cd ..\temptest\fctemp
+fc tvldtypes5.h5.xml tvldtypes5.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tvldtypes5.h5                                     PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tvldtypes5.h5                                     FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tvlstr.h5.xml --xml tvlstr.h5
+call ..\deleteline tvlstr.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tvlstr.h5.xml 3
+cd ..\temptest\fctemp
+fc tvlstr.h5.xml tvlstr.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tvlstr.h5                                         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tvlstr.h5                                         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tsaf.h5.xml --xml tsaf.h5
+call ..\deleteline tsaf.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tsaf.h5.xml 3
+cd ..\temptest\fctemp
+fc tsaf.h5.xml tsaf.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tsaf.h5                                           PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tsaf.h5                                           FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tempty.h5.xml --xml tempty.h5
+call ..\deleteline tempty.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tempty.h5.xml 3
+cd ..\temptest\fctemp
+fc tempty.h5.xml tempty.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tempty.h5                                         PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tempty.h5                                         FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tnamed_dtype_attr.h5.xml --xml tnamed_dtype_attr.h5
+call ..\deleteline tnamed_dtype_attr.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tnamed_dtype_attr.h5.xml 3
+cd ..\temptest\fctemp
+fc tnamed_dtype_attr.h5.xml tnamed_dtype_attr.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml tnamed_dtype_attr.h5                              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml tnamed_dtype_attr.h5                              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM other options for xml
+
+REM TOOLTEST tempty-dtd.h5.xml --xml --use-dtd tempty.h5
+call ..\deleteline tempty-dtd.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tempty-dtd.h5.xml 3
+cd ..\temptest\fctemp
+fc tempty-dtd.h5.xml tempty-dtd.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml --use-dtd tempty.h5                               PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml --use-dtd tempty.h5                               FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tempty-dtd-2.h5.xml --xml -u tempty.h5
+call ..\deleteline tempty-dtd-2.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tempty-dtd-2.h5.xml 3
+cd ..\temptest\fctemp
+fc tempty-dtd-2.h5.xml tempty-dtd-2.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml -u tempty.h5                                      PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml -u tempty.h5                                      FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tempty-nons.h5.xml --xml -X ":" tempty.h5
+call ..\deleteline tempty-nons.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tempty-nons.h5.xml 3
+cd ..\temptest\fctemp
+fc tempty-nons.h5.xml tempty-nons.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml -X ":" tempty.h5                                  PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml -X ":" tempty.h5                                  FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tempty-nons-2.h5.xml --xml --xml-ns=":" tempty.h5
+call ..\deleteline tempty-nons-2.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tempty-nons-2.h5.xml 3
+cd ..\temptest\fctemp
+fc tempty-nons-2.h5.xml tempty-nons-2.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml --xml-ns=":" tempty.h5                            PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml --xml-ns=":" tempty.h5                            FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM Some of these combinations are syntactically correct but
+REM the URLs are dummies 
+REM TOOLTEST tempty-ns.h5.xml --xml -X "thing:" tempty.h5
+call ..\deleteline tempty-ns.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tempty-ns.h5.xml 3
+cd ..\temptest\fctemp
+fc tempty-ns.h5.xml tempty-ns.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml -X "thing:" tempty.h5                             PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml -X "thing:" tempty.h5                             FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tempty-ns-2.h5.xml --xml --xml-ns="thing:" tempty.h5
+call ..\deleteline tempty-ns-2.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tempty-ns-2.h5.xml 3
+cd ..\temptest\fctemp
+fc tempty-ns-2.h5.xml tempty-ns-2.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml --xml-ns="thing:" tempty.h5                       PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml --xml-ns="thing:" tempty.h5                       FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tempty-nons-uri.h5.xml --xml --xml-ns=":" --xml-dtd="http://somewhere.net" tempty.h5
+call ..\deleteline tempty-nons-uri.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tempty-nons-uri.h5.xml 3
+cd ..\temptest\fctemp
+fc tempty-nons-uri.h5.xml tempty-nons-uri.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml-dtd="http://somewhere.net" tempty.h5              PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml-dtd="http://somewhere.net" tempty.h5              FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+REM TOOLTEST tempty-dtd-uri.h5.xml --xml --use-dtd --xml-dtd="http://somewhere.net" tempty.h5
+call ..\deleteline tempty-dtd-uri.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tempty-dtd-uri.h5.xml 3
+cd ..\temptest\fctemp
+fc tempty-dtd-uri.h5.xml tempty-dtd-uri.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml --use-dtd --xml-dtd="http://somewhere.net" temp   PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml --use-dtd --xml-dtd="http://somewhere.net" temp   FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM TOOLTEST tall-2A.h5.xml --xml -A tall.h5
+call ..\deleteline tall-2A.h5.xml.results 0 
+cd ..\testfiles
+call ..\deleteline tall-2A.h5.xml 3
+cd ..\temptest\fctemp
+fc tall-2A.h5.xml tall-2A.h5.xml.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5dump --xml -A tall.h5                                        PASSED >> ..\..\dumptest%2_%1.txt
+) else (
+   echo Testing h5dump --xml -A tall.h5                                        FAILED >> ..\..\dumptest%2_%1.txt
+   more temp.txt >> ..\..\dumptest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+cd ..
+
+rmdir /s/q temptest
\ No newline at end of file
diff --git a/windows/tools/importtest.BAT b/windows/tools/importtest.BAT
new file mode 100755
index 0000000..962665e
--- /dev/null
+++ b/windows/tools/importtest.BAT
@@ -0,0 +1,238 @@
+@ ECHO OFF
+
+mkdir temptest
+cd temptest
+mkdir act_h5
+mkdir exp_h5
+mkdir fctemp
+cd ..
+
+copy h5import\testfiles\*.h5 temptest\exp_h5\. >temp.txt
+del temp.txt
+
+cd testfiles\h5importtst\%1
+h5importtst
+
+cd ..\..\..\h5import%2\%1
+
+REM TESTING "ASCII I32 rank 3 - Output BE " ;
+h5import%2 ..\..\testfiles\h5importtst\%1\txtin32 -c ..\..\h5import\testfiles\textin32 -o ..\..\temptest\act_h5\test1.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test1.h5 >..\..\temptest\textin32_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test1.h5 >..\..\temptest\textin32_exp.txt
+
+REM TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
+h5import%2 ..\..\testfiles\h5importtst\%1\txtin16 -c ..\..\h5import\testfiles\textin16 -o ..\..\temptest\act_h5\test2.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test2.h5 >..\..\temptest\textin16_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test2.h5 >..\..\temptest\textin16_exp.txt
+
+REM TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed " 
+h5import%2 ..\..\testfiles\h5importtst\%1\txtin16 -c ..\..\h5import\testfiles\textin8 -o ..\..\temptest\act_h5\test3.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test3.h5 >..\..\temptest\textin8_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test3.h5 >..\..\temptest\textin8_exp.txt
+
+REM TESTING "ASCII UI32 - rank 3 - Output BE" 
+h5import%2 ..\..\h5import\testfiles\in1 -c ..\..\h5import\testfiles\textuin32 -o ..\..\temptest\act_h5\test4.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test4.h5 >..\..\temptest\textuin32_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test4.h5 >..\..\temptest\textuin32_exp.txt
+
+REM TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " 
+h5import%2 ..\..\h5import\testfiles\in1 -c ..\..\h5import\testfiles\textuin16 -o ..\..\temptest\act_h5\test5.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test5.h5 >..\..\temptest\textuin16_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test5.h5 >..\..\temptest\textuin16_exp.txt
+
+REM TESTING "ASCII F32 - rank 3 - Output LE " 
+h5import%2 ..\..\h5import\testfiles\fp1 -c ..\..\h5import\testfiles\textfp32 -o ..\..\temptest\act_h5\test6.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test6.h5 >..\..\temptest\textfp32_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test6.h5 >..\..\temptest\textfp32_exp.txt
+
+REM TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " 
+h5import%2 ..\..\h5import\testfiles\fp2 -c ..\..\h5import\testfiles\textfp64 -o ..\..\temptest\act_h5\test7.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test7.h5 >..\..\temptest\textfp64_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test7.h5 >..\..\temptest\textfp64_exp.txt
+
+REM TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
+h5import%2 ..\..\testfiles\h5importtst\%1\bfp64 -c ..\..\h5import\testfiles\conbfp64 -o ..\..\temptest\act_h5\test8.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test8.h5 >..\..\temptest\conbfp64_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test8.h5 >..\..\temptest\conbfp64_exp.txt
+
+REM TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
+h5import%2 ..\..\testfiles\h5importtst\%1\bin16 -c ..\..\h5import\testfiles\conbin16 -o ..\..\temptest\act_h5\test9.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test9.h5 >..\..\temptest\conbin16_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test9.h5 >..\..\temptest\conbin16_exp.txt
+
+REM TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
+h5import%2 ..\..\testfiles\h5importtst\%1\bin8 -c ..\..\h5import\testfiles\conbin8 -o ..\..\temptest\act_h5\test10.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test10.h5 >..\..\temptest\conbin8_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test10.h5 >..\..\temptest\conbin8_exp.txt
+
+REM TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED " 
+h5import%2 ..\..\testfiles\h5importtst\%1\bin32 -c ..\..\h5import\testfiles\conbin32 -o ..\..\temptest\act_h5\test11.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test11.h5 >..\..\temptest\conbin32_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test11.h5 >..\..\temptest\conbin32_exp.txt
+
+REM TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
+h5import%2 ..\..\testfiles\h5importtst\%1\buin16 -c ..\..\h5import\testfiles\conbuin16 -o ..\..\temptest\act_h5\test12.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test12.h5 >..\..\temptest\conbuin16_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test12.h5 >..\..\temptest\conbuin16_exp.txt
+
+REM TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED " 
+h5import%2 ..\..\testfiles\h5importtst\%1\buin32 -c ..\..\h5import\testfiles\conbuin32 -o ..\..\temptest\act_h5\test13.h5
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\act_h5\test13.h5 >..\..\temptest\conbuin32_act.txt
+..\..\h5dump%2\%1\h5dump%2 ..\..\temptest\exp_h5\test13.h5 >..\..\temptest\conbuin32_exp.txt
+
+cd ..\..\temptest
+
+type nul > ..\importtest%2_%1.txt
+echo ========================================== >> ..\importtest%2_%1.txt
+echo Testing importtest.bat >> ..\importtest%2_%1.txt
+echo ========================================== >> ..\importtest%2_%1.txt
+
+call ..\deleteline textin32_act.txt  1
+call ..\deleteline textin32_exp.txt  1
+call ..\deleteline textin16_act.txt  1
+call ..\deleteline textin16_exp.txt  1
+call ..\deleteline textin8_act.txt   1
+call ..\deleteline textin8_exp.txt   1
+call ..\deleteline textuin32_act.txt 1
+call ..\deleteline textuin32_exp.txt 1
+call ..\deleteline textuin16_act.txt 1
+call ..\deleteline textuin16_exp.txt 1
+call ..\deleteline textfp32_act.txt  1
+call ..\deleteline textfp32_exp.txt  1
+call ..\deleteline textfp64_act.txt  1
+call ..\deleteline textfp64_exp.txt  1
+call ..\deleteline conbfp64_act.txt  1
+call ..\deleteline conbfp64_exp.txt  1
+call ..\deleteline conbin16_act.txt  1
+call ..\deleteline conbin16_exp.txt  1
+call ..\deleteline conbin8_act.txt   1
+call ..\deleteline conbin8_exp.txt   1
+call ..\deleteline conbin32_act.txt  1
+call ..\deleteline conbin32_exp.txt  1
+call ..\deleteline conbuin16_act.txt 1
+call ..\deleteline conbuin16_exp.txt 1
+call ..\deleteline conbuin32_act.txt 1
+call ..\deleteline conbuin32_exp.txt 1
+
+cd fctemp
+fc textin32_act.txt  textin32_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing ASCII I32 rank 3 - Output BE                                   PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing ASCII I32 rank 3 - Output BE                                   FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc textin16_act.txt  textin16_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing ASCII I16 rank 3 - Output LE - CHUNKED - extended              PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing ASCII I16 rank 3 - Output LE - CHUNKED - extended              FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc textin8_act.txt   textin8_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed  PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed  FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc textuin32_act.txt textuin32_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing ASCII UI32 - rank 3 - Output BE                                PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing ASCII UI32 - rank 3 - Output BE                                FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc textuin16_act.txt textuin16_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing ASCII UI16 - rank 2 - Output LE+Chunked+Compressed             PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing ASCII UI16 - rank 2 - Output LE+Chunked+Compressed             FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc textfp32_act.txt  textfp32_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing ASCII F32 - rank 3 - Output LE                                 PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing ASCII F32 - rank 3 - Output LE                                 FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc textfp64_act.txt  textfp64_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed   PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed   FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc conbfp64_act.txt  conbfp64_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed    PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed    FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc conbin16_act.txt  conbin16_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing BINARY I16 - rank 3 - Output order LE + CHUNKED + extended     PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing BINARY I16 - rank 3 - Output order LE + CHUNKED + extended     FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc conbin8_act.txt   conbin8_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compress  PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compress  FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc conbin32_act.txt  conbin32_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing BINARY I32 - rank 3 - Output BE + CHUNKED                      PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing BINARY I32 - rank 3 - Output BE + CHUNKED                      FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc conbuin16_act.txt conbuin16_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing BINARY UI16 - rank 3 - Output byte BE + CHUNKED                PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing BINARY UI16 - rank 3 - Output byte BE + CHUNKED                FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+fc conbuin32_act.txt conbuin32_exp.txt >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing BINARY UI32 - rank 3 - Output LE + CHUNKED                     PASSED >> ..\..\importtest%2_%1.txt
+) else (
+   echo Testing BINARY UI32 - rank 3 - Output LE + CHUNKED                     FAILED >> ..\..\importtest%2_%1.txt
+   more temp.txt >> ..\..\importtest%2_%1.txt
+)
+del temp.txt
+
+cd ..
+cd ..
+
+rmdir /s/q temptest
\ No newline at end of file
diff --git a/windows/tools/lstest.BAT b/windows/tools/lstest.BAT
new file mode 100755
index 0000000..822cfc0
--- /dev/null
+++ b/windows/tools/lstest.BAT
@@ -0,0 +1,389 @@
+@ ECHO OFF
+
+mkdir temptest
+
+cd h5ls%2\%1
+
+h5ls%2 -w80 -h > ..\..\temptest\help-1.results 2>..\..\temptest\help-1_error.results
+more ..\..\temptest\help-1_error.results >> ..\..\temptest\help-1.results
+del ..\..\temptest\help-1_error.results
+
+h5ls%2 -w80 -help > ..\..\temptest\help-2.results 2>..\..\temptest\help-2_error.results
+more ..\..\temptest\help-2_error.results >> ..\..\temptest\help-2.results
+del ..\..\temptest\help-2_error.results
+
+h5ls%2 -w80 -? > ..\..\temptest\help-3.results 2>..\..\temptest\help-3_error.results
+more ..\..\temptest\help-3_error.results >> ..\..\temptest\help-3.results
+del ..\..\temptest\help-3_error.results
+
+
+h5ls%2 -w80 ..\..\testfiles\tall.h5 > ..\..\temptest\tall-1.results 2>..\..\temptest\tall-1_error.results
+more ..\..\temptest\tall-1_error.results >> ..\..\temptest\tall-1.results
+del ..\..\temptest\tall-1_error.results
+
+h5ls%2 -w80 -r -d ..\..\testfiles\tall.h5 > ..\..\temptest\tall-2.results 2>..\..\temptest\tall-2_error.results
+more ..\..\temptest\tall-2_error.results >> ..\..\temptest\tall-2.results
+del ..\..\temptest\tall-2_error.results
+
+h5ls%2 -w80 ..\..\testfiles\tgroup.h5 > ..\..\temptest\tgroup.results 2>..\..\temptest\tgroup_error.results
+more ..\..\temptest\tgroup_error.results >> ..\..\temptest\tgroup.results
+del ..\..\temptest\tgroup_error.results
+
+h5ls%2 -w80 -r -g ..\..\testfiles\tgroup.h5 > ..\..\temptest\tgroup-1.results 2>..\..\temptest\tgroup-1_error.results
+more ..\..\temptest\tgroup-1_error.results >> ..\..\temptest\tgroup-1.results
+del ..\..\temptest\tgroup-1_error.results
+
+h5ls%2 -w80 -r -d ..\..\testfiles\tdset.h5 > ..\..\temptest\tdset-1.results 2>..\..\temptest\tdset-1_error.results
+more ..\..\temptest\tdset-1_error.results >> ..\..\temptest\tdset-1.results
+del ..\..\temptest\tdset-1_error.results
+
+h5ls%2 -w80 -r ..\..\testfiles\tslink.h5 > ..\..\temptest\tslink-1.results 2>..\..\temptest\tslink-1_error.results
+more ..\..\temptest\tslink-1_error.results >> ..\..\temptest\tslink-1.results
+del ..\..\temptest\tslink-1_error.results
+
+h5ls%2 -w80 ..\..\testfiles\thlink.h5 > ..\..\temptest\thlink-1.results 2>..\..\temptest\thlink-1_error.results
+more ..\..\temptest\thlink-1_error.results >> ..\..\temptest\thlink-1.results
+del ..\..\temptest\thlink-1_error.results
+
+h5ls%2 -w80 -r -d ..\..\testfiles\tcompound.h5 > ..\..\temptest\tcomp-1.results 2>..\..\temptest\tcomp-1_error.results
+more ..\..\temptest\tcomp-1_error.results >> ..\..\temptest\tcomp-1.results
+del ..\..\temptest\tcomp-1_error.results
+
+h5ls%2 -w80 -r -d ..\..\testfiles\tnestedcomp.h5 > ..\..\temptest\tnestcomp-1.results 2>..\..\temptest\tnestcomp-1_error.results
+more ..\..\temptest\tnestcomp-1_error.results >> ..\..\temptest\tnestcomp-1.results
+del ..\..\temptest\tnestcomp-1_error.results
+
+h5ls%2 -w80 -r -d ..\..\testfiles\tloop.h5 > ..\..\temptest\tloop-1.results 2>..\..\temptest\tloop-1_error.results
+more ..\..\temptest\tloop-1_error.results >> ..\..\temptest\tloop-1.results
+del ..\..\temptest\tloop-1_error.results
+
+h5ls%2 -w80 -r -d ..\..\testfiles\tstr.h5 > ..\..\temptest\tstr-1.results 2>..\..\temptest\tstr-1_error.results
+more ..\..\temptest\tstr-1_error.results >> ..\..\temptest\tstr-1.results
+del ..\..\temptest\tstr-1_error.results
+
+h5ls%2 -w80 -r -d ..\..\testfiles\tsaf.h5 > ..\..\temptest\tsaf.results 2>..\..\temptest\tsaf_error.results
+more ..\..\temptest\tsaf_error.results >> ..\..\temptest\tsaf.results
+del ..\..\temptest\tsaf_error.results
+
+h5ls%2 -w80 -r -d ..\..\testfiles\tvldtypes1.h5 > ..\..\temptest\tvldtypes1.results 2>..\..\temptest\tvldtypes1_error.results
+more ..\..\temptest\tvldtypes1_error.results >> ..\..\temptest\tvldtypes1.results
+del ..\..\temptest\tvldtypes1_error.results
+
+h5ls%2 -w80 -r -d ..\..\testfiles\tarray1.h5 > ..\..\temptest\tarray1.results 2>..\..\temptest\tarray1_error.results
+more ..\..\temptest\tarray1_error.results >> ..\..\temptest\tarray1.results
+del ..\..\temptest\tarray1_error.results
+
+h5ls%2 -w80 -d ..\..\testfiles\tempty.h5 > ..\..\temptest\tempty.results 2>..\..\temptest\tempty_error.results
+more ..\..\temptest\tempty_error.results >> ..\..\temptest\tempty.results
+del ..\..\temptest\tempty_error.results
+
+h5ls%2 -w80 -v -S ..\..\testfiles\tattr2.h5 > ..\..\temptest\tattr2.results 2>..\..\temptest\tattr2_error.results
+more ..\..\temptest\tattr2_error.results >> ..\..\temptest\tattr2.results
+del ..\..\temptest\tattr2_error.results
+
+cd ..\..\temptest
+mkdir fctemp
+
+REM ##############################################################################
+REM ##############################################################################
+REM ###			        T H E   T E S T S                              ###
+REM ##############################################################################
+REM ##############################################################################
+
+type nul > ..\lstest%2_%1.txt
+echo ========================================== >> ..\lstest%2_%1.txt
+echo Testing lstest.bat >> ..\lstest%2_%1.txt
+echo ========================================== >> ..\lstest%2_%1.txt
+
+REM Toss in a bunch of tests.  Not sure if they are the right kinds.
+REM test the help syntax
+call ..\deleteline help-1.results 1 
+cd ..\testfiles
+call ..\deleteline help-1.ls 4
+cd ..\temptest\fctemp
+fc help-1.ls help-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -h                                                   PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -h                                                   FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline help-2.results 1 
+cd ..\testfiles
+call ..\deleteline help-2.ls 4
+cd ..\temptest\fctemp
+fc help-2.ls help-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -help                                                PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -help                                                FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline help-3.results 1 
+cd ..\testfiles
+call ..\deleteline help-3.ls 4
+cd ..\temptest\fctemp
+fc help-3.ls help-3.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -?                                                   PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -?                                                   FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test simple command
+call ..\deleteline tall-1.results 1 
+cd ..\testfiles
+call ..\deleteline tall-1.ls 4
+cd ..\temptest\fctemp
+fc tall-1.ls tall-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 tall.h5                                              PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 tall.h5                                              FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tall-2.results 1 
+cd ..\testfiles
+call ..\deleteline tall-2.ls 4
+cd ..\temptest\fctemp
+fc tall-2.ls tall-2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -d tall.h5                                        PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -d tall.h5                                        FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+call ..\deleteline tgroup.results 1 
+cd ..\testfiles
+call ..\deleteline tgroup.ls 4
+cd ..\temptest\fctemp
+fc tgroup.ls tgroup.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 tgroup.h5                                            PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 tgroup.h5                                            FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying groups
+call ..\deleteline tgroup-1.results 1 
+cd ..\testfiles
+call ..\deleteline tgroup-1.ls 4
+cd ..\temptest\fctemp
+fc tgroup-1.ls tgroup-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -g tgroup.h5                                      PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -g tgroup.h5                                      FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying simple space datasets
+call ..\deleteline tdset-1.results 1 
+cd ..\testfiles
+call ..\deleteline tdset-1.ls 4
+cd ..\temptest\fctemp
+fc tdset-1.ls tdset-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -d tdset.h5                                       PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -d tdset.h5                                       FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for displaying soft links
+call ..\deleteline tslink-1.results 1 
+cd ..\testfiles
+call ..\deleteline tslink-1.ls 4
+cd ..\temptest\fctemp
+fc tslink-1.ls tslink-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r tslink.h5                                         PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r tslink.h5                                         FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM tests for hard links
+call ..\deleteline thlink-1.results 1 
+cd ..\testfiles
+call ..\deleteline thlink-1.ls 4
+cd ..\temptest\fctemp
+fc thlink-1.ls thlink-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -w80 thlink.h5                                       PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -w80 thlink.h5                                       FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM tests for compound data types
+call ..\deleteline tcomp-1.results 1 
+cd ..\testfiles
+call ..\deleteline tcomp-1.ls 4
+cd ..\temptest\fctemp
+fc tcomp-1.ls tcomp-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -d tcompound.h5                                   PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -d tcompound.h5                                   FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for the nested compound type
+call ..\deleteline tnestcomp-1.results 1 
+cd ..\testfiles
+call ..\deleteline tnestcomp-1.ls 4
+cd ..\temptest\fctemp
+fc tnestcomp-1.ls tnestcomp-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -d tnestedcomp.h5                                 PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -d tnestedcomp.h5                                 FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for loop detection
+call ..\deleteline tloop-1.results 1 
+cd ..\testfiles
+call ..\deleteline tloop-1.ls 4
+cd ..\temptest\fctemp
+fc tloop-1.ls tloop-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -d tloop.h5                                       PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -d tloop.h5                                       FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for string 
+call ..\deleteline tstr-1.results 1 
+cd ..\testfiles
+call ..\deleteline tstr-1.ls 4
+cd ..\temptest\fctemp
+fc tstr-1.ls tstr-1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -d tstr.h5                                        PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -d tstr.h5                                        FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test test file created from lib SAF team
+call ..\deleteline tsaf.results 1 
+cd ..\testfiles
+call ..\deleteline tsaf.ls 4
+cd ..\temptest\fctemp
+fc tsaf.ls tsaf.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -d tsaf.h5                                        PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -d tsaf.h5                                        FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for variable length data types
+call ..\deleteline tvldtypes1.results 1 
+cd ..\testfiles
+call ..\deleteline tvldtypes1.ls 4
+cd ..\temptest\fctemp
+fc tvldtypes1.ls tvldtypes1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -d tvldtypes1.h5                                  PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -d tvldtypes1.h5                                  FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for array data types
+call ..\deleteline tarray1.results 1 
+cd ..\testfiles
+call ..\deleteline tarray1.ls 4
+cd ..\temptest\fctemp
+fc tarray1.ls tarray1.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -r -d tarray1.h5                                     PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -r -d tarray1.h5                                     FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for empty data
+call ..\deleteline tempty.results 1 
+cd ..\testfiles
+call ..\deleteline tempty.ls 4
+cd ..\temptest\fctemp
+fc tempty.ls tempty.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -d tempty.h5                                         PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -d tempty.h5                                         FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+REM test for all dataset types written to attributes
+REM enable -S for avoiding printing NATIVE types
+call ..\mask tattr2.results tattr2_temp.results
+del tattr2.results
+rename tattr2_temp.results tattr2.results
+call ..\deleteline tattr2.results 1
+cd ..\testfiles
+call ..\mask tattr2.ls tattr2_temp.ls
+del tattr2.ls
+rename tattr2_temp.ls tattr2.ls
+call ..\deleteline tattr2.ls 4
+cd ..\temptest\fctemp
+fc tattr2.ls tattr2.results >temp.txt
+if %ERRORLEVEL%==0 (
+   echo Testing h5ls -w80 -v -S tattr2.h5                                      PASSED >> ..\..\lstest%2_%1.txt
+) else (
+   echo Testing h5ls -w80 -v -S tattr2.h5                                      FAILED >> ..\..\lstest%2_%1.txt
+   more temp.txt >> ..\..\lstest%2_%1.txt
+)
+del temp.txt
+cd ..
+
+cd ..
+
+rmdir /s/q temptest
\ No newline at end of file
diff --git a/windows/tools/mask.BAT b/windows/tools/mask.BAT
new file mode 100755
index 0000000..3c8492f
--- /dev/null
+++ b/windows/tools/mask.BAT
@@ -0,0 +1,9 @@
+type nul > %2
+for /f "tokens=1,2*" %%a in (
+ %1
+) do ( if %%a==Modified: (
+          echo Modified: XXXX-XX-XX XX:XX:XX XXX>> %2
+)      else (
+          echo %%a %%b %%c>>%2
+)
+)
diff --git a/windows/tools/repacktest.BAT b/windows/tools/repacktest.BAT
new file mode 100755
index 0000000..ea5aace
--- /dev/null
+++ b/windows/tools/repacktest.BAT
@@ -0,0 +1,977 @@
+@ 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
+)
+
+REM testfiles\h5repacktst\%1\h5repacktst
+
+mkdir temptest
+type nul > temptest\empty.txt
+echo 0 differences found> temptest\empty.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\empty.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 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
+)
+
+: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
+)
+
+: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
+)
+
+: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
+)
+
+:NEXTSTEP7
+echo Testing h5repack test4.h5 -f SZIP=8,NN                                 -SKIP- >> ..\..\repacktest%2_%1.txt
+
+:NEXTSTEP8
+
+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
+)
+
+: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
+)
+
+:NEXTSTEP11
+echo Testing h5repack test_szip.h5                                          -SKIP- >> ..\..\repacktest%2_%1.txt
+
+: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
+)
+
+:NEXTSTEP13
+echo Testing h5repack test_szip.h5 -f dset_szip:NONE                        -SKIP- >> ..\..\repacktest%2_%1.txt
+
+: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
+)
+
+: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
+)
+
+:NEXTSTEP17
+echo Testing h5repack test_deflate.h5 -f dset_deflate:NONE                  -SKIP- >> ..\..\repacktest%2_%1.txt
+
+: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
+)
+
+: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
+)
+
+:NEXTSTEP21
+echo Testing h5repack test_deflate.h5 -f dset_deflate:SZIP=8,NN             -SKIP- >> ..\..\repacktest%2_%1.txt
+
+: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
+)
+
+:NEXTSTEP23
+echo Testing h5repack test_szip.h5 -f dset_szip:GZIP=1                      -SKIP- >> ..\..\repacktest%2_%1.txt
+
+: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
+) else (
+    echo Testing h5repack test4.h5 -f GZIP=1 -m 1024                            -SKIP- >> ..\..\repacktest%2_%1.txt
+    GOTO NEXTSTEP26
+)
+
+: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
+)
+
+:NEXTSTEP27
+echo Testing h5repack test4.h5 -e ../testfiles/h5repack_info.txt            -SKIP- >> ..\..\repacktest%2_%1.txt
+
+: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
+)
+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
diff --git a/windows/tools/testhdf5tools.BAT b/windows/tools/testhdf5tools.BAT
new file mode 100755
index 0000000..2d7b3ac
--- /dev/null
+++ b/windows/tools/testhdf5tools.BAT
@@ -0,0 +1,38 @@
+@ ECHO OFF
+
+REM  This batch file includes hdf5 tool(h5dump, h5diff, h5ls, h5import, and h5repack) testings.
+REM  testhdf5tools release  -- release static version
+REM  testhdf5tools debug  -- debug static version
+REM  testhdf5tools release dll -- release dll version
+REM  testhdf5tools debug dll -- debug dll version
+REM  By: Xuan Bai
+REM  Created: August 2, 2004
+REM  Last Modified: August 2, 2004
+
+@type nul > toolstest_%1%2.txt
+@echo ***************************************************************************** >> toolstest_%1%2.txt
+@echo            HDF5 Tools Tests -- %1 %2 >> toolstest_%1%2.txt
+@echo ***************************************************************************** >> toolstest_%1%2.txt
+
+call dumptest %1 %2
+@more dumptest%2_%1.txt >> toolstest_%1%2.txt
+@del dumptest%2_%1.txt
+
+
+call difftest %1 %2
+@more difftest%2_%1.txt >> toolstest_%1%2.txt
+@del difftest%2_%1.txt
+
+call lstest %1 %2
+@more lstest%2_%1.txt >> toolstest_%1%2.txt
+@del lstest%2_%1.txt
+
+call importtest %1 %2
+@more importtest%2_%1.txt >> toolstest_%1%2.txt
+@del importtest%2_%1.txt
+
+call repacktest %1 %2
+@more repacktest%2_%1.txt >> toolstest_%1%2.txt
+@del repacktest%2_%1.txt
+ 
+