From ceb99050034c37e0b5d635fa8e1783b8de926ef1 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 16 Mar 2017 11:33:40 -0400 Subject: [PATCH] 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 Commit-Queue: Ethan Nicholas --- .../compile/example.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json | 2 +- infra/bots/recipe_modules/flavor/gn_flavor.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 5f5e59c..a6669f5 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 864bd9d..590f0d1 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': -- 2.7.4