[svn-r17726] Updated the errorlevel checking for better error handling in the windows batch files.

1 files changed, 16 insertions, 5 deletions

diff --git a/windows/tools/checktools.bat b/windows/tools/checktools.bat
index f5a5b82..376e1fb 100644
--- a/windows/tools/checktools.bat
+++ b/windows/tools/checktools.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion

 pushd %~dp0

 

+set /a nerrors=0

+

 rem Clean any variables starting with "HDF5_TOOL_", as we use these for our

 rem tests.  Also clear "HDF5_TOOL_TESTS", as we will be addding all of our tests

 rem to this variable.

@@ -61,12 +63,16 @@ rem     %2 - "dll" or nothing
         rem Only add our parameters for batch scripts.

         call !hdf5_tool_%%a_test:.bat= %1 %2!

         rem Exit early if test fails.

-        if !errorlevel! neq 0 exit /b

+        if errorlevel 1 (

+            set /a nerrors=!nerrors!+1

+			echo.

+			echo.************************************

+			echo.  Testing %%a ^(%1 %2^)  FAILED

+			exit /b 1

+		)

     )

     

     rem If we get here, that means all of our tests passed.

-    echo.All tool tests passed.

-

     exit /b

 

 

@@ -147,6 +153,11 @@ rem on it for sending parameters.  --SJW 9/6/07
     rem Run the tests, passing in which version to run

     call :run_tests %*

         

+    if "%nerrors%"=="0" (

+		echo.All tool tests passed.

+	) else (

+        echo.** FAILED tool tests.

+    )

+        

     popd

-    endlocal & exit /b

-    
\ No newline at end of file
+    endlocal & exit /b %nerrors%