Kokoro: add Windows x86 (Win32) debug builds
This will help us detect issues with Windows x86 builds.
Bug: b/173800469
Change-Id: I4c752e5c15c48e36190a591e81e225bb422e204b
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/50668
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@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 3bd632c..a2ddc4a 100644
--- a/tests/kokoro/gcp_windows/continuous.bat
+++ b/tests/kokoro/gcp_windows/continuous.bat
@@ -19,7 +19,7 @@
cmake --version
cmake .. ^
- -G "Visual Studio 15 2017 Win64" ^
+ -G "%CMAKE_GENERATOR_TYPE%" ^
-Thost=x64 ^
"-DCMAKE_BUILD_TYPE=%BUILD_TYPE%" ^
"-DREACTOR_BACKEND=%REACTOR_BACKEND%" ^
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 dcfdd80..40cdf0e 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
@@ -17,3 +17,8 @@
key: "BUILD_TYPE"
value: "Debug"
}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017 Win64"
+}
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 dcfdd80..40cdf0e 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
@@ -17,3 +17,8 @@
key: "BUILD_TYPE"
value: "Debug"
}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017 Win64"
+}
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
new file mode 100644
index 0000000..2ca8ec9
--- /dev/null
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/continuous.cfg
@@ -0,0 +1,24 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous script in Git.
+build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
+
+env_vars {
+ key: "REACTOR_BACKEND"
+ value: "LLVM"
+}
+
+env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
+ key: "BUILD_TYPE"
+ value: "Debug"
+}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017"
+}
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
new file mode 100644
index 0000000..2ca8ec9
--- /dev/null
+++ b/tests/kokoro/gcp_windows/reactor_llvm/10.0/debug_x86/presubmit.cfg
@@ -0,0 +1,24 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous script in Git.
+build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
+
+env_vars {
+ key: "REACTOR_BACKEND"
+ value: "LLVM"
+}
+
+env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
+ key: "BUILD_TYPE"
+ value: "Debug"
+}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017"
+}
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 3302963..ded9b83 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
@@ -17,3 +17,8 @@
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017 Win64"
+}
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 3302963..ded9b83 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
@@ -17,3 +17,8 @@
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017 Win64"
+}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
index 33abaa4..e632fcb 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug/continuous.cfg
@@ -17,3 +17,8 @@
key: "BUILD_TYPE"
value: "Debug"
}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017 Win64"
+}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
index 33abaa4..e632fcb 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug/presubmit.cfg
@@ -17,3 +17,8 @@
key: "BUILD_TYPE"
value: "Debug"
}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017 Win64"
+}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/continuous.cfg
new file mode 100644
index 0000000..f479edd
--- /dev/null
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/continuous.cfg
@@ -0,0 +1,24 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous script in Git.
+build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
+
+env_vars {
+ key: "REACTOR_BACKEND"
+ value: "Subzero"
+}
+
+env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
+ key: "BUILD_TYPE"
+ value: "Debug"
+}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017"
+}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/presubmit.cfg
new file mode 100644
index 0000000..f479edd
--- /dev/null
+++ b/tests/kokoro/gcp_windows/reactor_subzero/debug_x86/presubmit.cfg
@@ -0,0 +1,24 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous script in Git.
+build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
+
+env_vars {
+ key: "REACTOR_BACKEND"
+ value: "Subzero"
+}
+
+env_vars {
+ key: "LLVM_VERSION"
+ value: "10.0"
+}
+
+env_vars {
+ key: "BUILD_TYPE"
+ value: "Debug"
+}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017"
+}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg b/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
index fada9fb..38b71c1 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
@@ -17,3 +17,8 @@
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017 Win64"
+}
diff --git a/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg b/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
index fada9fb..38b71c1 100644
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
@@ -17,3 +17,8 @@
key: "BUILD_TYPE"
value: "RelWithDebInfo"
}
+
+env_vars {
+ key: "CMAKE_GENERATOR_TYPE"
+ value: "Visual Studio 15 2017 Win64"
+}
