1 files changed, 16 insertions, 5 deletions
diff --git a/windows/hl/c++/test/checkhlcpptests.bat b/windows/hl/c++/test/checkhlcpptests.bat
index 24b7f55..db3f329 100644
--- a/windows/hl/c++/test/checkhlcpptests.bat
+++ b/windows/hl/c++/test/checkhlcpptests.bat
@@ -22,6 +22,8 @@ rem
 setlocal enabledelayedexpansion
 pushd %~dp0
 
+set /a nerrors=0
+
 rem Clean any variables starting with "HDF5_HLCPPTEST_", as we use these for our
 rem tests.  Also clear "HDF5_HLCPPTEST_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_hlcpptest_%%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 HL C++ library tests passed.
-
     exit /b
 
 
@@ -82,6 +88,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 HL C++ library tests passed.
+	) else (
+        echo.** FAILED HL C++ Library tests.
+    )
+        
     popd
-    endlocal & exit /b
-    
-\ No newline at end of file
+    endlocal & exit /b %nerrors%