diff options
| author |  Brian Osman <brianosman@google.com> | 2018-05-31 12:57:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-31 18:01:14 +0000 |
| commit | 6dce0a72e0a9e5302246aa716741ed1faa620b30 (patch) | |
| tree | cbc475b0e48c8f2bb6d76001eeddf0bfcf49c296 /infra/bots/recipe_modules | |
| parent | 65eb4fba7e22bc5e5420290a4ef31e59054609e5 (diff) | |
Enable GPU support in MSAN builds
Don't want to test GPU with MSAN, but I'd like to make GPU support
required for DM and other internal tools.
Bug: skia:
Change-Id: I5f1a7669242be9767aa3b579b39740a1741977f3
Reviewed-on: https://skia-review.googlesource.com/131143
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'infra/bots/recipe_modules')
| -rw-r--r-- | infra/bots/recipe_modules/build/default.py | 1 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/infra/bots/recipe_modules/build/default.py b/infra/bots/recipe_modules/build/default.py index cb98d21e21..af293d9712 100644 --- a/infra/bots/recipe_modules/build/default.py +++ b/infra/bots/recipe_modules/build/default.py @@ -158,7 +158,6 @@ def compile_fn(api, checkout_root, out_dir): chrome_dir = checkout_root api.run.run_once(build_command_buffer, api, chrome_dir, skia_dir, out_dir) if 'MSAN' in extra_tokens: - args['skia_enable_gpu'] = 'false' args['skia_use_fontconfig'] = 'false' if 'ASAN' in extra_tokens or 'UBSAN' in extra_tokens: args['skia_enable_spirv_validation'] = 'false' diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json index 81bbf346e6..56f92fe648 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json @@ -32,7 +32,7 @@ "[START_DIR]/cache/work/skia/bin/gn", "gen", "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/msan\"] sanitize=\"MSAN\" skia_enable_gpu=false skia_use_fontconfig=false target_cpu=\"x86_64\"" + "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DDUMMY_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/msan\"] sanitize=\"MSAN\" skia_use_fontconfig=false target_cpu=\"x86_64\"" ], "cwd": "[START_DIR]/cache/work/skia", "env": { |