AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable GPU support in MSAN builds

Browse Source 
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>
This commit is contained in:
Brian Osman 2018-05-31 12:57:22 -04:00 committed by Skia Commit-Bot
parent 65eb4fba7e
commit 6dce0a72e0
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
infra/bots/recipe_modules/build/default.py
View File

@ -158,7 +158,6 @@ def compile_fn(api, checkout_root, out_dir):
chrome_dir = checkout_root chrome_dir = checkout_root
api.run.run_once(build_command_buffer, api, chrome_dir, skia_dir, out_dir) api.run.run_once(build_command_buffer, api, chrome_dir, skia_dir, out_dir)
if 'MSAN' in extra_tokens: if 'MSAN' in extra_tokens:
args['skia_enable_gpu'] = 'false'
args['skia_use_fontconfig'] = 'false' args['skia_use_fontconfig'] = 'false'
if 'ASAN' in extra_tokens or 'UBSAN' in extra_tokens: if 'ASAN' in extra_tokens or 'UBSAN' in extra_tokens:
args['skia_enable_spirv_validation'] = 'false' args['skia_enable_spirv_validation'] = 'false'

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-MSAN.json
View File

@ -32,7 +32,7 @@
"[START_DIR]/cache/work/skia/bin/gn", "[START_DIR]/cache/work/skia/bin/gn",
"gen", "gen",
"[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-MSAN/Debug", "[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", "cwd": "[START_DIR]/cache/work/skia",
"env": { "env": {