1 files changed, 49 insertions, 3 deletions
diff --git a/windows/tools/repacktest.BAT b/windows/tools/repacktest.BAT
index aa36438..d3b58de 100755
--- a/windows/tools/repacktest.BAT
+++ b/windows/tools/repacktest.BAT
@@ -252,36 +252,82 @@ call %tooltest% %test4% %nodiff%
 ::all filters
 ::------------
 set flag=-i %test4% -o %output4% -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10
-call %tooltest% %test4% %nodiff% 
 
+:: Check whether szlib or zlib is available, if either library is not available, skip the test.
+
+if "%HDF5_EXT_SZIP%"=="" (
+	call %tooltest% %test4% %nodiff% skip
+  )else (
+     if "%HDF5_EXT_ZLIB%"=="" (
+        call %tooltest% %test4% %nodiff% skip
+     ) else (
+        call %tooltest% %test4% %nodiff%
+     )
+  )
 :: ***********************************************************
-::  the following tests assume the input files have filters
+::  If the filter exists,the following tests assume the input files have filters
 :: ***********************************************************
 
 ::-----------
 :: szip copy
 ::-----------
 set flag=-i %test_szip% -o %output_szip% 
+
+::-----------
+:: The following checks whether szip library is available,
+:: If not, skip the test.
+::-----------
+if "%HDF5_EXT_SZIP%"=="" goto SKIP_SZIP_COPY
 call %tooltest% %test_szip% %nodiff%
+: SKIP_SZIP_COPY
+call %tooltest% %test_szip% %nodiff% skip
 
 ::------------
 ::szip remove
 ::------------
 set flag=-i %test_szip% -o %output_szip% -f dset_szip:NONE
+
+::-----------
+:: The following checks whether szip library is available,
+:: If not, skip the test.
+::-----------
+if "%HDF5_EXT_SZIP%"=="" goto SKIP_SZIP_REMOVE
 call %tooltest% %test_szip% %nodiff%
 
+: SKIP_SZIP_REMOVE
+call %tooltest% %test_szip% %nodiff% skip
+
 ::--------------
 :: deflate copy
 ::--------------
 set flag=-i %test_deflate% -o %output_deflate%
-call %tooltest% %test_deflate% %nodiff%
+
+::-----------
+:: The following checks whether zlib library is available,
+:: If not, skip the test.
+::-----------
+if "%HDF5_EXT_ZLIB%"=="" goto SKIP_ZLIB_COPY
+call %tooltest% %test_deflate% %nodiff% 
+
+: SKIP_ZLIB_COPY
+call %tooltest% %test_deflate% %nodiff% skip
 
 ::---------------
 :: deflate remove
 ::---------------
 set flag=-i %test_deflate% -o %output_deflate% -f dset_deflate:NONE
+
+::-----------
+:: The following checks whether zlib library is available,
+:: If not, skip the test.
+::-----------
+if "%HDF5_EXT_ZLIB%"=="" goto SKIP_ZLIB_REMOVE
 call %tooltest% %test_deflate% %nodiff%
 
+: SKIP_ZLIB_REMOVE
+call %tooltest% %test_deflate% %nodiff% skip
+
+
 ::--------------  
 :: shuffle copy
 ::--------------