Skip to content

S
swiftshader
Commit 13f23077 by Ben Clayton
Options

Kokoro: Split the windows and linux configs

This is done so that we can build for both the subzero and llvm backends. Old configs remain where they are during a transition period. Bug: b/130343040 Change-Id: Icc9e1b92074ef90aacfd9e6d40b021d35f4d9ef3 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28908Tested-by: 's avatarBen Clayton <bclayton@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 4e8044d9
Showing with 86 additions and 1 deletion
tests/kokoro/gcp_ubuntu/continuous.cfg
# Format: //devtools/kokoro/config/proto/build.proto # Format: //devtools/kokoro/config/proto/build.proto
# TODO(b/130343040): REMOVE THIS FILE.
# Location of the continuous bash script in Git. # Location of the continuous bash script in Git.
build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh" build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
tests/kokoro/gcp_ubuntu/continuous.sh
...@@ -11,7 +11,11 @@ git submodule update --init ...@@ -11,7 +11,11 @@ git submodule update --init
mkdir -p build && cd build mkdir -p build && cd build
cmake .. if [[ -z "${REACTOR_BACKEND}" ]]; then
REACTOR_BACKEND="LLVM"
fi
cmake .. "-DREACTOR_BACKEND=${REACTOR_BACKEND}"
make --jobs=$(nproc) make --jobs=$(nproc)
# Run the reactor unit tests. # Run the reactor unit tests.
......
tests/kokoro/gcp_ubuntu/presubmit.cfg
# Format: //devtools/kokoro/config/proto/build.proto # Format: //devtools/kokoro/config/proto/build.proto
# TODO(b/130343040): REMOVE THIS FILE.
# Location of the continuous bash script in Git. # Location of the continuous bash script in Git.
build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh" build_file: "SwiftShader/tests/kokoro/gcp_ubuntu/continuous.sh"
tests/kokoro/gcp_ubuntu/reactor_llvm/continuous.cfg 0 → 100644
# 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"
}
tests/kokoro/gcp_ubuntu/reactor_llvm/presubmit.cfg 0 → 100644
# 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"
}
tests/kokoro/gcp_ubuntu/reactor_subzero/continuous.cfg 0 → 100644
# 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"
}
tests/kokoro/gcp_ubuntu/reactor_subzero/presubmit.cfg 0 → 100644
# 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"
}
tests/kokoro/gcp_windows/continuous.bat
...@@ -9,6 +9,7 @@ git submodule update --init ...@@ -9,6 +9,7 @@ git submodule update --init
SET MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild" SET MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild"
SET CONFIG=Debug SET CONFIG=Debug
REM TODO: Switch between reactor backends with the REACTOR_BACKEND env var.
%MSBUILD% /p:Configuration=%CONFIG% SwiftShader.sln %MSBUILD% /p:Configuration=%CONFIG% SwiftShader.sln
SET PATH=%PATH%;T:\src\git\SwiftShader\out\Debug_x64 SET PATH=%PATH%;T:\src\git\SwiftShader\out\Debug_x64
......
tests/kokoro/gcp_windows/continuous.cfg
# Format: //devtools/kokoro/config/proto/build.proto # Format: //devtools/kokoro/config/proto/build.proto
# TODO(b/130343040): REMOVE THIS FILE.
# Location of the continuous script in Git. # Location of the continuous script in Git.
build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat" build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
tests/kokoro/gcp_windows/presubmit.cfg
# Format: //devtools/kokoro/config/proto/build.proto # Format: //devtools/kokoro/config/proto/build.proto
# TODO(b/130343040): REMOVE THIS FILE.
# Location of the continuous script in Git. # Location of the continuous script in Git.
build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat" build_file: "SwiftShader/tests/kokoro/gcp_windows/continuous.bat"
tests/kokoro/gcp_windows/reactor_llvm/continuous.cfg 0 → 100644
# 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"
}
tests/kokoro/gcp_windows/reactor_llvm/presubmit.cfg 0 → 100644
# 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"
}
tests/kokoro/gcp_windows/reactor_subzero/continuous.cfg 0 → 100644
# 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"
}
tests/kokoro/gcp_windows/reactor_subzero/presubmit.cfg 0 → 100644
# 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"
}
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