From 6f719aeeae5fc600faaf4b55e7efc11fe2df19b3 Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Wed, 25 Apr 2018 11:07:59 -0700 Subject: Add CheckGeneratedFiles recipe check for gpu workarounds Followup to https://skia-review.googlesource.com/122800 Bug: chromium: 829614 Change-Id: Idde753e0f8943290208625ba5b6332a5fdc07184 Reviewed-on: https://skia-review.googlesource.com/123536 Commit-Queue: Adrienne Walker Commit-Queue: Eric Boren Auto-Submit: Adrienne Walker Reviewed-by: Eric Boren --- .../full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json | 2 +- infra/bots/recipe_modules/flavor/gn_flavor.py | 1 + .../Housekeeper-PerCommit-CheckGeneratedFiles.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'infra/bots') diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index 0181bdde8f..964fe89f6c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -36,7 +36,7 @@ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/build/out/Release", - "--args=is_debug=false skia_compile_processors=true" + "--args=is_debug=false skia_compile_processors=true skia_generate_workarounds=true" ], "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 fa8a4b29d8..fc1a199475 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -215,6 +215,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): args['skia_ios_profile'] = '"Upstream Testing Provisioning Profile"' if 'CheckGeneratedFiles' in extra_tokens: args['skia_compile_processors'] = 'true' + args['skia_generate_workarounds'] = 'true' if compiler == 'Clang' and 'Win' in os: args['clang_win'] = '"%s"' % self.m.vars.slave_dir.join('clang_win') extra_cflags.append('-DDUMMY_clang_win_version=%s' % diff --git a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index 7e9314a9f6..7c9fe21dab 100644 --- a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -188,7 +188,7 @@ "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/build/out/Release", - "--args=is_debug=false skia_compile_processors=true" + "--args=is_debug=false skia_compile_processors=true skia_generate_workarounds=true" ], "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { -- cgit v1.2.3