commit 8d00100a9a84f970d9b73d0da5d9eeb24ac5c84e
author Antonio Maiorano <amaiorano@google.com> Fri Dec 04 11:28:17 2020 -0500
committer Antonio Maiorano <amaiorano@google.com> Fri Dec 04 20:42:52 2020 +0000
tree 73f9469f40f13cf063ce5445b80a17f0b3bd42b8
parent 0404ca82687648473f279c469ccdf6f78c01e242

Kokoro: isolate flag enabling for incremental builds

Also fix Windows build so that REACTOR_EMIT_PRINT_LOCATION is actually
enabled.

Bug: b/174358505
Change-Id: I742fd48fd982915a452b4b86ceaf44d383797b55
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/50892
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>

tests/kokoro/gcp_ubuntu/continuous.sh

diff --git a/tests/kokoro/gcp_ubuntu/continuous.sh b/tests/kokoro/gcp_ubuntu/continuous.sh
index b80b4c1..15ece27 100755
--- a/tests/kokoro/gcp_ubuntu/continuous.sh
+++ b/tests/kokoro/gcp_ubuntu/continuous.sh
@@ -50,6 +50,7 @@
 cd build
 cmake .. "-DREACTOR_ENABLE_PRINT=1"
 cmake --build . --target ReactorUnitTests -- -j $(nproc)
+cmake .. "-DREACTOR_ENABLE_PRINT=0"
 cd ..
 build/ReactorUnitTests --gtest_filter=ReactorUnitTests.Print*
 
@@ -57,10 +58,12 @@
 cd build
 cmake .. "-DREACTOR_EMIT_DEBUG_INFO=1"
 cmake --build . --target ReactorUnitTests -- -j $(nproc)
+cmake .. "-DREACTOR_EMIT_DEBUG_INFO=0"
 cd ..
 
 # Incrementally build with REACTOR_EMIT_PRINT_LOCATION to ensure it builds
 cd build
 cmake .. "-DREACTOR_EMIT_PRINT_LOCATION=1"
 cmake --build . --target ReactorUnitTests -- -j $(nproc)
+cmake .. "-DREACTOR_EMIT_PRINT_LOCATION=0"
 cd ..

tests/kokoro/gcp_windows/continuous.bat

diff --git a/tests/kokoro/gcp_windows/continuous.bat b/tests/kokoro/gcp_windows/continuous.bat
index a2ddc4a..0a1b0c5 100644
--- a/tests/kokoro/gcp_windows/continuous.bat
+++ b/tests/kokoro/gcp_windows/continuous.bat
@@ -42,18 +42,20 @@
 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
+Debug\ReactorUnitTests.exe --gtest_filter=ReactorUnitTests.Print* || goto :error
+cmake "-DREACTOR_ENABLE_PRINT=0" .. || goto :error
 
 REM Incrementally build with REACTOR_EMIT_DEBUG_INFO to ensure it builds
 cd %SRC%\build || goto :error
 cmake "-DREACTOR_EMIT_DEBUG_INFO=1" .. || goto :error
 cmake --build . --target ReactorUnitTests || goto :error
+cmake "-DREACTOR_EMIT_DEBUG_INFO=0" .. || goto :error
 
 REM Incrementally build with REACTOR_EMIT_PRINT_LOCATION to ensure it builds
 cd %SRC%\build || goto :error
-cmake "-REACTOR_EMIT_PRINT_LOCATION=1" .. || goto :error
+cmake "-DREACTOR_EMIT_PRINT_LOCATION=1" .. || goto :error
 cmake --build . --target ReactorUnitTests || goto :error
+cmake "-DREACTOR_EMIT_PRINT_LOCATION=0" .. || goto :error
 
 exit /b 0