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 <[email protected]> Commit-Queue: Eric Boren <[email protected]> Auto-Submit: Adrienne Walker <[email protected]> Reviewed-by: Eric Boren <[email protected]>
rust-skia · Apr 25, 2018 · 6f719ae · 6f719ae
1 parent d3c84ff
commit 6f719ae
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/...cipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/...cipe_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
@@ -215,6 +215,7 @@ def compile(self, unused_target):
       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/...ots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/...ots/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": {

diff --git a/src/gpu/GrDriverBugWorkaroundsAutogen.h b/src/gpu/GrDriverBugWorkaroundsAutogen.h
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is auto-generated from
-//    ../../tools/build_workaround_header.py
+// This file is auto-generated from build_workaround_header.py
 // DO NOT EDIT!
 
 #define GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)\

diff --git a/tools/build_workaround_header.py b/tools/build_workaround_header.py
@@ -15,9 +15,9 @@
 
 """
 
-_DO_NOT_EDIT_WARNING = ("// This file is auto-generated from\n" +
-  "//    " + __file__ + "\n" +
-  "// DO NOT EDIT!\n\n")
+_DO_NOT_EDIT_WARNING = ("// This file is auto-generated from " +
+                        os.path.basename(__file__) + "\n" +
+                        "// DO NOT EDIT!\n\n")
 
 def merge_files_into_workarounds(files):
   workarounds = set()