Skip to content

S
swiftshader
Commit 8d00100a by Antonio Maiorano
Options

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: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent 0404ca82
Showing with 8 additions and 3 deletions
tests/kokoro/gcp_ubuntu/continuous.sh
...@@ -50,6 +50,7 @@ build/vk-unittests ...@@ -50,6 +50,7 @@ build/vk-unittests
cd build cd build
cmake .. "-DREACTOR_ENABLE_PRINT=1" cmake .. "-DREACTOR_ENABLE_PRINT=1"
cmake --build . --target ReactorUnitTests -- -j $(nproc) cmake --build . --target ReactorUnitTests -- -j $(nproc)
cmake .. "-DREACTOR_ENABLE_PRINT=0"
cd .. cd ..
build/ReactorUnitTests --gtest_filter=ReactorUnitTests.Print* build/ReactorUnitTests --gtest_filter=ReactorUnitTests.Print*
...@@ -57,10 +58,12 @@ build/ReactorUnitTests --gtest_filter=ReactorUnitTests.Print* ...@@ -57,10 +58,12 @@ build/ReactorUnitTests --gtest_filter=ReactorUnitTests.Print*
cd build cd build
cmake .. "-DREACTOR_EMIT_DEBUG_INFO=1" cmake .. "-DREACTOR_EMIT_DEBUG_INFO=1"
cmake --build . --target ReactorUnitTests -- -j $(nproc) cmake --build . --target ReactorUnitTests -- -j $(nproc)
cmake .. "-DREACTOR_EMIT_DEBUG_INFO=0"
cd .. cd ..
# Incrementally build with REACTOR_EMIT_PRINT_LOCATION to ensure it builds # Incrementally build with REACTOR_EMIT_PRINT_LOCATION to ensure it builds
cd build cd build
cmake .. "-DREACTOR_EMIT_PRINT_LOCATION=1" cmake .. "-DREACTOR_EMIT_PRINT_LOCATION=1"
cmake --build . --target ReactorUnitTests -- -j $(nproc) cmake --build . --target ReactorUnitTests -- -j $(nproc)
cmake .. "-DREACTOR_EMIT_PRINT_LOCATION=0"
cd .. cd ..
tests/kokoro/gcp_windows/continuous.bat
...@@ -42,18 +42,20 @@ REM Incrementally build and run rr::Print unit tests ...@@ -42,18 +42,20 @@ REM Incrementally build and run rr::Print unit tests
cd %SRC%\build || goto :error cd %SRC%\build || goto :error
cmake "-DREACTOR_ENABLE_PRINT=1" .. || goto :error cmake "-DREACTOR_ENABLE_PRINT=1" .. || goto :error
cmake --build . --target ReactorUnitTests || goto :error cmake --build . --target ReactorUnitTests || goto :error
cd %SRC% || goto :error Debug\ReactorUnitTests.exe --gtest_filter=ReactorUnitTests.Print* || goto :error
build\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 REM Incrementally build with REACTOR_EMIT_DEBUG_INFO to ensure it builds
cd %SRC%\build || goto :error cd %SRC%\build || goto :error
cmake "-DREACTOR_EMIT_DEBUG_INFO=1" .. || goto :error cmake "-DREACTOR_EMIT_DEBUG_INFO=1" .. || goto :error
cmake --build . --target ReactorUnitTests || 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 REM Incrementally build with REACTOR_EMIT_PRINT_LOCATION to ensure it builds
cd %SRC%\build || goto :error 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 --build . --target ReactorUnitTests || goto :error
cmake "-DREACTOR_EMIT_PRINT_LOCATION=0" .. || goto :error
exit /b 0 exit /b 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment