diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-16 11:33:40 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-16 16:15:14 +0000 |
| commit | ceb99050034c37e0b5d635fa8e1783b8de926ef1 (patch) | |
| tree | e1fbc5c19b34ba6797835abdc7b5eb87bfeb44c5 | |
| parent | 9e9188f84b15a25e27f63d5f8de3ccd393d9a173 (diff) | |
turned off SPIR-V validation on ASAN bots
BUG=skia:
Change-Id: Ia86abbc5f0922a4818075c487c76b6fb0560a6c8
Reviewed-on: https://skia-review.googlesource.com/9800
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
| -rw-r--r-- | infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json | 2 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 5f5e59c4cd..a6669f59b5 100644 --- a/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -99,7 +99,7 @@ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[CUSTOM_/_B_WORK]/skia/out/Build-Ubuntu-Clang-x86_64-Debug-ASAN/Debug", - "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-O1\"] extra_ldflags=[\"-fuse-ld=lld\"] sanitize=\"ASAN\" target_cpu=\"x86_64\"" + "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-O1\"] extra_ldflags=[\"-fuse-ld=lld\"] sanitize=\"ASAN\" skia_enable_spirv_validation=false target_cpu=\"x86_64\"" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 864bd9db40..590f0d1799 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -75,6 +75,8 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): args['skia_use_gdi'] = 'true' if extra_config == 'MSAN': args['skia_use_fontconfig'] = 'false' + if extra_config == 'ASAN': + args['skia_enable_spirv_validation'] = 'false' if extra_config == 'Mesa': args['skia_use_mesa'] = 'true' if extra_config == 'Mini': |