Kokoro: Split tests into Debug and RelWithDebInfo

Both code paths will be tested for Windows, macOS, Linux for both LLVM and Subzero backends. Bug: b/145836207 Change-Id: I707b1551fe1a65549c47a6d7756ab94aeb8d80e2 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39312 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Ben Clayton <bclayton@google.com> Reviewed-by: Chris Forbes <chrisforbes@google.com>

Kokoro: Split tests into Debug and RelWithDebInfo
50211670 · Ben Clayton · 5346cf50 · 50211670 · 50211670 · 50211670
Commit 50211670 authored Dec 10, 2019 by Ben Clayton
27 changed files
--- a/tests/kokoro/gcp_ubuntu/continuous.sh
+++ b/tests/kokoro/gcp_ubuntu/continuous.sh
@@ -25,7 +25,7 @@ if [[ -z "${REACTOR_BACKEND}" ]]; then
  REACTOR_BACKEND="LLVM"
 fi

-cmake .. "-DREACTOR_BACKEND=${REACTOR_BACKEND}" "-DREACTOR_VERIFY_LLVM_IR=1"
+cmake .. "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" "-DREACTOR_BACKEND=${REACTOR_BACKEND}" "-DREACTOR_VERIFY_LLVM_IR=1"
 make --jobs=$(nproc)

 # Run unit tests

--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/continuous.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "LLVM"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/presubmit.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "LLVM"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/release/continuous.cfg
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous bash script in Git.
+build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
+
+env_vars {
+  key: "REACTOR_BACKEND"
+  value: "LLVM"
+}
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/gcp_ubuntu/reactor_llvm/release/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_llvm/release/presubmit.cfg
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous bash script in Git.
+build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
+
+env_vars {
+  key: "REACTOR_BACKEND"
+  value: "LLVM"
+}
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/continuous.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "Subzero"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/presubmit.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "Subzero"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/continuous.cfg
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous bash script in Git.
+build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
+
+env_vars {
+  key: "REACTOR_BACKEND"
+  value: "Subzero"
+}
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/gcp_ubuntu/reactor_subzero/release/presubmit.cfg
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous bash script in Git.
+build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
+
+env_vars {
+  key: "REACTOR_BACKEND"
+  value: "Subzero"
+}
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/gcp_windows/continuous.bat
+++ b/tests/kokoro/gcp_windows/continuous.bat
@@ -17,7 +17,7 @@ SET CONFIG=Debug
 cd %SRC%\build
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!

-cmake .. -G "Visual Studio 15 2017 Win64" -Thost=x64 "-DREACTOR_BACKEND=%REACTOR_BACKEND%" "-DREACTOR_VERIFY_LLVM_IR=1"
+cmake .. -G "Visual Studio 15 2017 Win64" -Thost=x64 "-DCMAKE_BUILD_TYPE=%BUILD_TYPE%" "-DREACTOR_BACKEND=%REACTOR_BACKEND%" "-DREACTOR_VERIFY_LLVM_IR=1"
 if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!

 %MSBUILD% /p:Configuration=%CONFIG% SwiftShader.sln

--- a/tests/kokoro/gcp_windows/reactor_llvm/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/continuous.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "LLVM"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/gcp_windows/reactor_llvm/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/presubmit.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "LLVM"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/release/continuous.cfg
+# 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: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/gcp_windows/reactor_llvm/release/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_llvm/release/presubmit.cfg
+# 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: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/gcp_windows/reactor_subzero/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/continuous.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "Subzero"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/gcp_windows/reactor_subzero/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/presubmit.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "Subzero"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/continuous.cfg
+# 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: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/gcp_windows/reactor_subzero/release/presubmit.cfg
+# 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: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/macos/continuous.sh
+++ b/tests/kokoro/macos/continuous.sh
@@ -15,7 +15,7 @@ if [[ -z "${REACTOR_BACKEND}" ]]; then
  REACTOR_BACKEND="LLVM"
 fi

-cmake .. "-DASAN=ON" "-DREACTOR_BACKEND=${REACTOR_BACKEND}" "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DREACTOR_VERIFY_LLVM_IR=1"
+cmake .. "-DASAN=ON" "-DCMAKE_BUILD_TYPE=${BUILD_TYPE}" "-DREACTOR_BACKEND=${REACTOR_BACKEND}" "-DREACTOR_VERIFY_LLVM_IR=1"
 make -j$(sysctl -n hw.logicalcpu)

 # Run unit tests

--- a/tests/kokoro/macos/reactor_llvm/continuous.cfg
+++ b/tests/kokoro/macos/reactor_llvm/continuous.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "LLVM"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/macos/reactor_llvm/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_llvm/presubmit.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "LLVM"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/macos/reactor_llvm/release/continuous.cfg
+++ b/tests/kokoro/macos/reactor_llvm/release/continuous.cfg
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous bash script in Git.
+build_file: "SwiftShader/tests/kokoro/macos/continuous.sh"
+
+env_vars {
+  key: "REACTOR_BACKEND"
+  value: "LLVM"
+}
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/macos/reactor_llvm/release/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_llvm/release/presubmit.cfg
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous bash script in Git.
+build_file: "SwiftShader/tests/kokoro/macos/continuous.sh"
+
+env_vars {
+  key: "REACTOR_BACKEND"
+  value: "LLVM"
+}
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/macos/reactor_subzero/continuous.cfg
+++ b/tests/kokoro/macos/reactor_subzero/continuous.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "Subzero"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/macos/reactor_subzero/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_subzero/presubmit.cfg
@@ -7,3 +7,8 @@ env_vars {
  key: "REACTOR_BACKEND"
  value: "Subzero"
 }
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "Debug"
+}
--- a/tests/kokoro/macos/reactor_subzero/release/continuous.cfg
+++ b/tests/kokoro/macos/reactor_subzero/release/continuous.cfg
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous bash script in Git.
+build_file: "SwiftShader/tests/kokoro/macos/continuous.sh"
+
+env_vars {
+  key: "REACTOR_BACKEND"
+  value: "Subzero"
+}
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}
--- a/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg
+++ b/tests/kokoro/macos/reactor_subzero/release/presubmit.cfg
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous bash script in Git.
+build_file: "SwiftShader/tests/kokoro/macos/continuous.sh"
+
+env_vars {
+  key: "REACTOR_BACKEND"
+  value: "Subzero"
+}
+
+env_vars {
+  key: "BUILD_TYPE"
+  value: "RelWithDebInfo"
+}