Minor modification to roll_webgl_conformance.py

tools/roll_webgl_conformance.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import collections
 import logging
 import os
 import re
 import subprocess
 import sys
 import time
 
 extra_trybots = [
   {
     "mastername": "tryserver.chromium.win",
     "buildernames": ["win_optional_gpu_tests_rel"]
   },
   {
     "mastername": "tryserver.chromium.mac",
     "buildernames": ["mac_optional_gpu_tests_rel"]
-  }
+  },
+  {
+    "mastername": "tryserver.chromium.linux",
+    "buildernames": ["linux_optional_gpu_tests_rel"]
+  },
 ]
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 SRC_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir))
 sys.path.insert(0, os.path.join(SRC_DIR, 'build'))
 import find_depot_tools
 find_depot_tools.add_depot_tools_to_path()
 import roll_dep_svn
 from gclient import GClientKeywords
 from third_party import upload
@@ skipping 188 matching lines @@
 
   def _UpdateReadmeFile(self, readme_path, new_revision):
     readme = open(os.path.join(self._chromium_src, readme_path), 'r+')
     txt = readme.read()
     m = re.sub(re.compile('.*^Revision\: ([0-9]*).*', re.MULTILINE),
         ('Revision: %s' % new_revision), txt)
     readme.seek(0)
     readme.write(m)
     readme.truncate()
 
-  def PrepareRoll(self, ignore_checks, skip_tryjobs):
+  def PrepareRoll(self, ignore_checks, run_tryjobs):
     # TODO(kjellander): use os.path.normcase, os.path.join etc for all paths for
     # cross platform compatibility.
 
     if not ignore_checks:
       if self._GetCurrentBranchName() != 'master':
         logging.error('Please checkout the master branch.')
         return -1
       if not self._IsTreeClean():
         logging.error('Please make sure you don\'t have any modified files.')
         return -1
@@ skipping 30 matching lines @@
       bugs = self._GetBugList(WEBGL_PATH, webgl_current, webgl_latest)
       description = _GenerateCLDescriptionCommand(
           webgl_current, webgl_latest, bugs)
       logging.debug('Committing changes locally.')
       self._RunCommand(['git', 'add', '--update', '.'])
       self._RunCommand(['git', 'commit'] + description)
       logging.debug('Uploading changes...')
       self._RunCommand(['git', 'cl', 'upload'],
                        extra_env={'EDITOR': 'true'})
 
-      if not skip_tryjobs:
+      if run_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']:
@@ skipping 64 matching lines @@
   parser = argparse.ArgumentParser(
       description='Auto-generates a CL containing a WebGL conformance roll.')
   parser.add_argument('--abort',
     help=('Aborts a previously prepared roll. '
           'Closes any associated issues and deletes the roll branches'),
     action='store_true')
   parser.add_argument('--ignore-checks', action='store_true', default=False,
       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('--run-tryjobs', action='store_true', default=False,
+      help=('Start the dry-run tryjobs for the newly generated CL. Use this '
+            'when you have no need to make changes to the WebGL conformance '
+            'test expectations in the same CL and want to avoid.'))
   parser.add_argument('-v', '--verbose', action='store_true', default=False,
       help='Be extra verbose in printing of log messages.')
   args = parser.parse_args()
 
   if args.verbose:
     logging.basicConfig(level=logging.DEBUG)
   else:
     logging.basicConfig(level=logging.ERROR)
 
   autoroller = AutoRoller(SRC_DIR)
   if args.abort:
     return autoroller.Abort()
   else:
-    return autoroller.PrepareRoll(args.ignore_checks, args.skip_tryjobs)
+    return autoroller.PrepareRoll(args.ignore_checks, args.run_tryjobs)
 
 if __name__ == '__main__':
   sys.exit(main())