diff options
Diffstat (limited to 'windows/hl')
| -rw-r--r-- | windows/hl/c++/test/checkhlcpptests.bat | 21 | ||||
| -rw-r--r-- | windows/hl/examples/test_hl_cexamples.BAT | 12 | ||||
| -rw-r--r-- | windows/hl/fortran/test/checkhlfortrantests.bat | 21 | ||||
| -rw-r--r-- | windows/hl/test/checkhltests.bat | 20 |
4 files changed, 54 insertions, 20 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%
diff --git a/windows/hl/examples/test_hl_cexamples.BAT b/windows/hl/examples/test_hl_cexamples.BAT index 4fb6309..652a602 100644 --- a/windows/hl/examples/test_hl_cexamples.BAT +++ b/windows/hl/examples/test_hl_cexamples.BAT @@ -39,30 +39,30 @@ GOTO WRONG echo Testing %1 %2 version of High Level examples
echo.
- HLCexamples%1%2\ex_ds1%2.exe HLCexamples%1%2
+ ex_ds1%2\%1\ex_ds1%2.exe ex_ds1%1%2
for /l %%a in (1,1,2) do (
- HLCexamples%1%2\ex_image%%a%2.exe HLCexamples%1%2
+ ex_image%%a%2\%1\ex_image%%a%2.exe ex_image%%a%1%2
if not !errorlevel!==0 set /A total_error=!total_error!+1
)
for /l %%a in (1,1,3) do (
- HLCexamples%1%2\ex_lite%%a%2.exe HLCexamples%1%2
+ ex_lite%%a%2\%1\ex_lite%%a%2.exe ex_lite%%a%1%2
if not !errorlevel!==0 set /A total_error=!total_error!+1
)
for /l %%a in (1,1,9) do (
- HLCexamples%1%2\ex_table0%%a%2.exe HLCexamples%1%2
+ ex_table0%%a%2\%1\ex_table0%%a%2.exe ex_table0%%a%1%2
if not !errorlevel!==0 set /A total_error=!total_error!+1
)
for /l %%a in (10,1,12) do (
- HLCexamples%1%2\ex_table%%a%2.exe HLCexamples%1%2
+ ex_table%%a%2\%1\ex_table%%a%2.exe ex_table%%a%1%2
if not !errorlevel!==0 set /A total_error=!total_error!+1
)
for %%a in (FL VL) do (
- HLCexamples%1%2\ptExample%%a%2.exe HLCexamples%1%2
+ ptExample%%a%2\%1\ptExample%%a%2.exe ptExample%%a%1%2
if not !errorlevel!==0 set /A total_error=!total_error!+1
)
diff --git a/windows/hl/fortran/test/checkhlfortrantests.bat b/windows/hl/fortran/test/checkhlfortrantests.bat index 98d9c38..0710625 100644 --- a/windows/hl/fortran/test/checkhlfortrantests.bat +++ b/windows/hl/fortran/test/checkhlfortrantests.bat @@ -22,6 +22,8 @@ rem setlocal enabledelayedexpansion
pushd %~dp0
+set /a nerrors=0
+
rem Clean any variables starting with "HDF5_HLFORTTEST_", as we use these for our
rem tests. Also clear "HDF5_HLFORTTEST_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_hlforttest_%%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 Fortran library tests passed.
-
exit /b
@@ -84,6 +90,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 Fortran library tests passed.
+ ) else (
+ echo.** FAILED HL Fortran Library tests.
+ )
+
popd
- endlocal & exit /b
-
\ No newline at end of file + endlocal & exit /b %nerrors%
diff --git a/windows/hl/test/checkhltests.bat b/windows/hl/test/checkhltests.bat index 925c245..0804148 100644 --- a/windows/hl/test/checkhltests.bat +++ b/windows/hl/test/checkhltests.bat @@ -22,6 +22,8 @@ rem setlocal enabledelayedexpansion
pushd %~dp0
+set /a nerrors=0
+
rem Clean any variables starting with "HDF5_HLTEST_", as we use these for our
rem tests. Also clear "HDF5_HLTEST_TESTS", as we will be addding all of our tests
rem to this variable.
@@ -66,12 +68,16 @@ rem %2 - "dll" or nothing rem Only add our parameters for batch scripts.
call !hdf5_hltest_%%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 library tests passed.
-
exit /b
@@ -134,6 +140,12 @@ 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 library tests passed.
+ ) else (
+ echo.** FAILED HL Library tests.
+ )
+
popd
- endlocal & exit /b
+ endlocal & exit /b %nerrors%
\ No newline at end of file |