Run WebGL 2.0 conformance tests in more cases.

tools/roll_angle.py

Index: tools/roll_angle.py
diff --git a/tools/roll_angle.py b/tools/roll_angle.py
index 751d4ac72eff3ae37276eee309ef8ce78ecd27b8..c6d3c083a10b46fbdbf42683a46461ad06641b15 100755
--- a/tools/roll_angle.py
+++ b/tools/roll_angle.py
@@ -15,7 +15,7 @@ import time
 extra_trybots = [
   {
     "mastername": "tryserver.chromium.win",
-    "buildername": "win_clang_dbg",
+    "buildernames": ["win_clang_dbg", "win_optional_gpu_tests_rel"]
   }
 ]
 
@@ -97,12 +97,25 @@ def _GenerateCLDescriptionCommand(angle_current, angle_new, bugs):
     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):
@@ -261,17 +274,20 @@ class AutoRoller(object):
       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)