Use Ninja as CMake generator for Kokoro tests on Windows
Bug: b/214633609
Change-Id: I2e08cc72c159dd314a61afe010183f8dac951bad
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/61428
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Nicolas Capens <nicolascapens@google.com>
diff --git a/tests/VulkanWrapper/VulkanTester.cpp b/tests/VulkanWrapper/VulkanTester.cpp
index 18ded58..ec681b8 100644
--- a/tests/VulkanWrapper/VulkanTester.cpp
+++ b/tests/VulkanWrapper/VulkanTester.cpp
@@ -169,21 +169,25 @@
return { "./build/Release_x64/vk_swiftshader.dll",
"./build/Release/vk_swiftshader.dll",
"./build/RelWithDebInfo/vk_swiftshader.dll",
+ "./build/vk_swiftshader.dll",
"./vk_swiftshader.dll" };
# else
return { "./build/Release_Win32/vk_swiftshader.dll",
"./build/Release/vk_swiftshader.dll",
"./build/RelWithDebInfo/vk_swiftshader.dll",
+ "./build/vk_swiftshader.dll",
"./vk_swiftshader.dll" };
# endif
# else
# if defined(_WIN64)
return { "./build/Debug_x64/vk_swiftshader.dll",
"./build/Debug/vk_swiftshader.dll",
+ "./build/vk_swiftshader.dll",
"./vk_swiftshader.dll" };
# else
return { "./build/Debug_Win32/vk_swiftshader.dll",
"./build/Debug/vk_swiftshader.dll",
+ "./build/vk_swiftshader.dll",
"./vk_swiftshader.dll" };
# endif
# endif
diff --git a/tests/kokoro/gcp_windows/continuous.bat b/tests/kokoro/gcp_windows/continuous.bat
index 821fd1b..e872078 100644
--- a/tests/kokoro/gcp_windows/continuous.bat
+++ b/tests/kokoro/gcp_windows/continuous.bat
@@ -18,9 +18,15 @@
REM choco upgrade cmake -y --limit-output --no-progress
cmake --version
+rem To use ninja with CMake requires VC env vars
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+rem That batch file turned echo off, so turn it back on
+@echo on
+
+rem Note that we need to specify the C and C++ compiler only because Cygwin is in PATH and CMake finds GCC and picks that over MSVC
cmake .. ^
-G "%CMAKE_GENERATOR_TYPE%" ^
- -Thost=x64 ^
+ -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" ^
"-DREACTOR_BACKEND=%REACTOR_BACKEND%" ^
"-DSWIFTSHADER_LLVM_VERSION=%LLVM_VERSION%" ^
"-DREACTOR_VERIFY_LLVM_IR=1" ^
@@ -32,22 +38,22 @@
cd %SRC% || goto :error
SET SWIFTSHADER_DISABLE_DEBUGGER_WAIT_DIALOG=1
-build\%BUILD_TYPE%\ReactorUnitTests.exe || goto :error
-build\%BUILD_TYPE%\system-unittests.exe || goto :error
-build\%BUILD_TYPE%\vk-unittests.exe || goto :error
+build\ReactorUnitTests.exe || goto :error
+build\system-unittests.exe || goto :error
+build\vk-unittests.exe || goto :error
REM Incrementally build and run rr::Print unit tests
cd %SRC%\build || goto :error
cmake "-DREACTOR_ENABLE_PRINT=1" .. || goto :error
cmake --build . --config %BUILD_TYPE% --target ReactorUnitTests || goto :error
-%BUILD_TYPE%\ReactorUnitTests.exe --gtest_filter=ReactorUnitTests.Print* || goto :error
+ReactorUnitTests.exe --gtest_filter=ReactorUnitTests.Print* || goto :error
cmake "-DREACTOR_ENABLE_PRINT=0" .. || goto :error
REM Incrementally build with REACTOR_EMIT_ASM_FILE and run unit test
cd %SRC%\build || goto :error
cmake "-DREACTOR_EMIT_ASM_FILE=1" .. || goto :error
cmake --build . --config %BUILD_TYPE% --target ReactorUnitTests || goto :error
-%BUILD_TYPE%\ReactorUnitTests.exe --gtest_filter=ReactorUnitTests.EmitAsm || goto :error
+ReactorUnitTests.exe --gtest_filter=ReactorUnitTests.EmitAsm || goto :error
cmake "-DREACTOR_EMIT_ASM_FILE=0" .. || goto :error
REM Incrementally build with REACTOR_EMIT_DEBUG_INFO to ensure it builds
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/continuous.cfg
index 40cdf0e..27b1e3a 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/continuous.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017 Win64"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/presubmit.cfg
index 40cdf0e..27b1e3a 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug/presubmit.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017 Win64"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/continuous.cfg
index 2ca8ec9..27b1e3a 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/continuous.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/presubmit.cfg
index 2ca8ec9..27b1e3a 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/presubmit.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/continuous.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/continuous.cfg
index ded9b83..2fb886a 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/continuous.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017 Win64"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/presubmit.cfg
index ded9b83..2fb886a 100644
--- a/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/release/presubmit.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017 Win64"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
index e632fcb..dfffa2c 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017 Win64"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
index e632fcb..dfffa2c 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017 Win64"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/continuous.cfg
index f479edd..dfffa2c 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/continuous.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/presubmit.cfg
index f479edd..dfffa2c 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/presubmit.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
index 38b71c1..a062739 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017 Win64"
+ value: "Ninja"
}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
index 38b71c1..a062739 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
@@ -20,5 +20,5 @@
env_vars {
key: "CMAKE_GENERATOR_TYPE"
- value: "Visual Studio 15 2017 Win64"
+ value: "Ninja"
}
