Make Windows Kokoro script less verbose
This is as close as we'll get to "set -e" from bash. Makes the script
less verbose, and closer to the Linux and MacOS ones.
Bug: b/159633249
Change-Id: Ied7cdb5ab11b737fb21379be912393bbd838a40a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/45968
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>
diff --git a/tests/kokoro/gcp_windows/continuous.bat b/tests/kokoro/gcp_windows/continuous.bat
index ec9b05c..c8a96b2 100644
--- a/tests/kokoro/gcp_windows/continuous.bat
+++ b/tests/kokoro/gcp_windows/continuous.bat
@@ -3,11 +3,9 @@
SETLOCAL ENABLEDELAYEDEXPANSION
SET PATH=C:\python36;C:\Program Files\cmake\bin;%PATH%
-set SRC=%cd%\git\SwiftShader
+SET SRC=%cd%\git\SwiftShader
-cd %SRC%
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-
+cd %SRC% || goto :error
IF "%LLVM_VERSION%"=="10.0" (
ECHO "TODO(b/152339534): LLVM 10 migration is still in progress"
@@ -17,10 +15,9 @@
# Lower the amount of debug info, to reduce Kokoro build times.
SET LESS_DEBUG_INFO=1
-cd %SRC%\build
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+cd %SRC%\build || goto :error
-rem Update CMake
+REM Update CMake
choco upgrade cmake -y --limit-output --no-progress
cmake --version
@@ -31,42 +28,27 @@
"-DREACTOR_BACKEND=%REACTOR_BACKEND%" ^
"-DSWIFTSHADER_LLVM_VERSION=%LLVM_VERSION%" ^
"-DREACTOR_VERIFY_LLVM_IR=1" ^
- "-DLESS_DEBUG_INFO=%LESS_DEBUG_INFO%"
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+ "-DLESS_DEBUG_INFO=%LESS_DEBUG_INFO%" || goto :error
-cmake --build .
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+cmake --build . || goto :error
REM Run the unit tests. Some must be run from project root
-cd %SRC%
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+cd %SRC% || goto :error
SET SWIFTSHADER_DISABLE_DEBUGGER_WAIT_DIALOG=1
-build\Debug\ReactorUnitTests.exe
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+build\Debug\ReactorUnitTests.exe || goto :error
+build\Debug\gles-unittests.exe || goto :error
+build\Debug\system-unittests.exe || goto :error
+build\Debug\vk-unittests.exe || goto :error
-build\Debug\gles-unittests.exe
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+REM Incrementally build and run rr::Print unit tests
+cd %SRC%\build || goto :error
+cmake "-DREACTOR_ENABLE_PRINT=1" .. || goto :error
+cmake --build . --target ReactorUnitTests || goto :error
+cd %SRC% || goto :error
+build\Debug\ReactorUnitTests.exe --gtest_filter=ReactorUnitTests.Print* || goto :error
-build\Debug\system-unittests.exe
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+exit /b 0
-build\Debug\vk-unittests.exe
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-
-Rem Incrementally build and run rr::Print unit tests
-cd %SRC%\build
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-
-cmake "-DREACTOR_ENABLE_PRINT=1" ..
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-
-cmake --build . --target ReactorUnitTests
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-
-cd %SRC%
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
-SET SWIFTSHADER_DISABLE_DEBUGGER_WAIT_DIALOG=1
-
-build\Debug\ReactorUnitTests.exe --gtest_filter=ReactorUnitTests.Print*
-if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
+:error
+exit /b !ERRORLEVEL!