Run WebGL 2.0 conformance tests in more cases.

tools/roll_angle.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",
-    "buildername": "win_clang_dbg",
+    "buildernames": ["win_clang_dbg", "win_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
@@ skipping 61 matching lines @@
     for bug in bugs:
       bug_str += str(bug) + ','
     return bug_str.rstrip(',')
 
   if angle_current.git_commit != angle_new.git_commit:
     change_str = GetChangeString(angle_current.git_commit,
                                  angle_new.git_commit)
     changelog_url = GetChangeLogURL(angle_current.git_repo_url,
                                     change_str)
 
+  def GetExtraTrybotString():
+    s = ''
+    for t in extra_trybots:
+      if s:
+        s += ';'
+      s += t['mastername'] + ':' + ','.join(t['buildernames'])
+    return s
+
+  extra_trybot_args = []
+  if extra_trybots:
+    extra_trybot_string = GetExtraTrybotString()
+    extra_trybot_args = ['-m', 'CQ_INCLUDE_TRYBOTS=' + extra_trybot_string]
+
   return [
     '-m', 'Roll ANGLE ' + change_str,
     '-m', '%s' % changelog_url,
     '-m', GetBugString(bugs),
     '-m', 'TEST=bots',
-  ]
+  ] + extra_trybot_args
 
 
 class AutoRoller(object):
   def __init__(self, chromium_src):
     self._chromium_src = chromium_src
 
   def _RunCommand(self, command, working_dir=None, ignore_exit_code=False,
                   extra_env=None):
     """Runs a command and returns the stdout from that command.
 
@@ skipping 138 matching lines @@
       bugs = self._GetBugList(ANGLE_PATH, angle_current, angle_latest)
       description = _GenerateCLDescriptionCommand(
           angle_current, angle_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'})
 
-      # Run the default trybots
+      # Kick off tryjobs.
       base_try_cmd = ['git', 'cl', 'try']
       self._RunCommand(base_try_cmd)
 
       if extra_trybots:
-        # Run additional tryjobs
-        extra_try_args = []
-        for extra_trybot in extra_trybots:
-          extra_try_args += ['-m', extra_trybot["mastername"],
-                             '-b', extra_trybot["buildername"]]
-        self._RunCommand(base_try_cmd + extra_try_args)
+        # 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)
 
     # Checkout master again.
     self._RunCommand(['git', 'checkout', 'master'])
     print 'Roll branch left as ' + ROLL_BRANCH_NAME
     return 0
 
   def _UpdateDep(self, deps_filename, dep_relative_to_src, commit_info):
@@ skipping 68 matching lines @@
     logging.basicConfig(level=logging.ERROR)
 
   autoroller = AutoRoller(SRC_DIR)
   if args.abort:
     return autoroller.Abort()
   else:
     return autoroller.PrepareRoll(args.ignore_checks)
 
 if __name__ == '__main__':
   sys.exit(main())