aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/recipe_modules
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2018-06-11 12:19:40 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-11 17:13:54 +0000
commit57f8fcd422b1fbcc44ac3cf90c2c0fc2403ac868 (patch)
tree202c9a3a7346e900207c842d33bba7a956b9b477 /infra/bots/recipe_modules
parent79aea6a147f87994963ea9a464647cd64e8d475d (diff)
When compiling SwiftShader, set BUILD_TESTS=OFF.
After https://swiftshader-review.googlesource.com/c/SwiftShader/+/19228, SwiftShader fails to build without third_party/googletest unless BUILD_TESTS is disabled. Bug: skia:8054 Change-Id: If365fbbfc42dd3c41cc57be0fd7d494e7f83589d Reviewed-on: https://skia-review.googlesource.com/133832 Reviewed-by: Ravi Mistry <rmistry@google.com> Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipe_modules')
-rw-r--r--infra/bots/recipe_modules/build/default.py2
-rw-r--r--infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json1
2 files changed, 2 insertions, 1 deletions
diff --git a/infra/bots/recipe_modules/build/default.py b/infra/bots/recipe_modules/build/default.py
index bb2a019365..5c88febe2e 100644
--- a/infra/bots/recipe_modules/build/default.py
+++ b/infra/bots/recipe_modules/build/default.py
@@ -35,7 +35,7 @@ def compile_swiftshader(api, swiftshader_root, cc, cxx, out):
api.file.ensure_directory('makedirs swiftshader_out', out)
with api.context(cwd=out, env=env):
api.run(api.step, 'swiftshader cmake',
- cmd=['cmake', swiftshader_root, '-GNinja'])
+ cmd=['cmake', '-DBUILD_TESTS=OFF', swiftshader_root, '-GNinja'])
api.run(api.step, 'swiftshader ninja',
cmd=['ninja', '-C', out, 'libEGL.so', 'libGLESv2.so'])
diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json
index 6fa9d0dace..9ed4a73708 100644
--- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json
+++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json
@@ -31,6 +31,7 @@
{
"cmd": [
"cmake",
+ "-DBUILD_TESTS=OFF",
"[START_DIR]/cache/work/skia/third_party/externals/swiftshader",
"-GNinja"
],