Roll WebGL 863cabb..8b636f3

tools/roll_webgl_conformance.py

Index: tools/roll_webgl_conformance.py
diff --git a/tools/roll_webgl_conformance.py b/tools/roll_webgl_conformance.py
index cc41bf19384fdf2790850787866734e3b59f03a2..7ea056f1f5092f0638be1d7c82c4f64444faa3b0 100755
--- a/tools/roll_webgl_conformance.py
+++ b/tools/roll_webgl_conformance.py
@@ -229,7 +229,7 @@ class AutoRoller(object):
     readme.write(m)
     readme.truncate()
 
-  def PrepareRoll(self, ignore_checks):
+  def PrepareRoll(self, ignore_checks, skip_tryjobs):
     # TODO(kjellander): use os.path.normcase, os.path.join etc for all paths for
     # cross platform compatibility.
 
@@ -280,20 +280,20 @@ class AutoRoller(object):
       self._RunCommand(['git', 'cl', 'upload'],
                        extra_env={'EDITOR': 'true'})
 
-      # Kick off tryjobs.
-      base_try_cmd = ['git', 'cl', 'try']
-      self._RunCommand(base_try_cmd)
-
-      if extra_trybots:
-        # Run additional tryjobs.
-        # TODO(kbr): this should not be necessary -- the
-        # CQ_INCLUDE_TRYBOTS directive above should handle it.
-        # http://crbug.com/585237
-        for trybot in extra_trybots:
-          for builder in trybot['buildernames']:
-            self._RunCommand(base_try_cmd + [
-                '-m', trybot['mastername'],
-                '-b', builder])
+      if not skip_tryjobs:
+        # Kick off tryjobs.
+        base_try_cmd = ['git', 'cl', 'try']
+        self._RunCommand(base_try_cmd)
+        if extra_trybots:
+          # Run additional tryjobs.
+          # TODO(kbr): this should not be necessary -- the
+          # CQ_INCLUDE_TRYBOTS directive above should handle it.
+          # http://crbug.com/585237
+          for trybot in extra_trybots:
+            for builder in trybot['buildernames']:
+              self._RunCommand(base_try_cmd + [
+                  '-m', trybot['mastername'],
+                  '-b', builder])
 
       cl_info = self._GetCLInfo()
       print 'Issue: %d URL: %s' % (cl_info.issue, cl_info.url)
@@ -365,6 +365,11 @@ def main():
       help=('Skips checks for being on the master branch, dirty workspaces and '
             'the updating of the checkout. Will still delete and create local '
             'Git branches.'))
+  parser.add_argument('--skip-tryjobs', action='store_true', default=False,
+      help=('Skip the dry-run tryjobs for the newly generated CL. Use this '
+            'when you expect to have to make many changes to the WebGL '
+            'conformance test expectations in the same CL and want to avoid '
+            'wasted tryjobs.'))
   parser.add_argument('-v', '--verbose', action='store_true', default=False,
       help='Be extra verbose in printing of log messages.')
   args = parser.parse_args()
@@ -378,7 +383,7 @@ def main():
   if args.abort:
     return autoroller.Abort()
   else:
-    return autoroller.PrepareRoll(args.ignore_checks)
+    return autoroller.PrepareRoll(args.ignore_checks, args.skip_tryjobs)
 
 if __name__ == '__main__':
   sys.exit(main())