Make roll_webgl_conformance.py force all GPU tests.

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
@@ skipping 34 matching lines @@
 
 CHROMIUM_GIT_URL = 'https://chromium.googlesource.com/chromium/src.git'
 CL_ISSUE_RE = re.compile('^Issue number: ([0-9]+) \((.*)\)$')
 RIETVELD_URL_RE = re.compile('^https?://(.*)/(.*)')
 ROLL_BRANCH_NAME = 'special_webgl_roll_branch'
 TRYJOB_STATUS_SLEEP_SECONDS = 30
 
 # Use a shell for subcommands on Windows to get a PATH search.
 IS_WIN = sys.platform.startswith('win')
 WEBGL_PATH = os.path.join('third_party', 'webgl', 'src')
+WEBGL_REVISION_TEXT_FILE = os.path.join(
+  'content', 'test', 'gpu', 'gpu_tests', 'webgl_conformance_revision.txt')
 
 CommitInfo = collections.namedtuple('CommitInfo', ['git_commit',
                                                    'git_repo_url'])
 CLInfo = collections.namedtuple('CLInfo', ['issue', 'url', 'rietveld_server'])
 
 def _PosixPath(path):
   """Convert a possibly-Windows path to a posix-style path."""
   (_, path) = os.path.splitdrive(path)
   return path.replace(os.sep, '/')
 
@@ skipping 30 matching lines @@
 
   def GetChangeLogURL(git_repo_url, change_string):
     return '%s/+log/%s' % (git_repo_url, change_string)
 
   def GetBugString(bugs):
     bug_str = 'BUG='
     for bug in bugs:
       bug_str += str(bug) + ','
     return bug_str.rstrip(',')
 
-  if webgl_current.git_commit != webgl_new.git_commit:
-    change_str = GetChangeString(webgl_current.git_commit,
-                                 webgl_new.git_commit)
-    changelog_url = GetChangeLogURL(webgl_current.git_repo_url,
-                                    change_str)
+  change_str = GetChangeString(webgl_current.git_commit,
+                               webgl_new.git_commit)
+  changelog_url = GetChangeLogURL(webgl_current.git_repo_url,
+                                  change_str)
+  if webgl_current.git_commit == webgl_new.git_commit:
+    print 'WARNING: WebGL repository is unchanged; proceeding with no-op roll'
 
   def GetExtraTrybotString():
     s = ''
     for t in extra_trybots:
       if s:
         s += ';'
       s += t['mastername'] + ':' + ','.join(t['buildernames'])
     return s
 
   extra_trybot_args = []
@@ skipping 146 matching lines @@
     webgl_current = self._GetDepsCommitInfo(deps, WEBGL_PATH)
 
     # Find ToT revisions.
     webgl_latest = self._GetCommitInfo(WEBGL_PATH)
 
     if IS_WIN:
       # Make sure the roll script doesn't use windows line endings
       self._RunCommand(['git', 'config', 'core.autocrlf', 'true'])
 
     self._UpdateDep(deps_filename, WEBGL_PATH, webgl_latest)
+    self._UpdateWebGLRevTextFile(WEBGL_REVISION_TEXT_FILE, webgl_latest)
 
     if self._IsTreeClean():
       logging.debug('Tree is clean - no changes detected.')
       self._DeleteRollBranch()
     else:
       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', '.'])
@@ skipping 29 matching lines @@
     dep_name = _PosixPath(os.path.join('src', dep_relative_to_src))
 
     # roll_dep_svn.py relies on cwd being the Chromium checkout, so let's
     # temporarily change the working directory and then change back.
     cwd = os.getcwd()
     os.chdir(os.path.dirname(deps_filename))
     roll_dep_svn.update_deps(deps_filename, dep_relative_to_src, dep_name,
                              commit_info.git_commit, '')
     os.chdir(cwd)
 
+  def _UpdateWebGLRevTextFile(self, txt_filename, commit_info):
+    # Rolling the WebGL conformance tests must cause at least all of
+    # the WebGL tests to run. There are already exclusions in
+    # trybot_analyze_config.json which force all tests to run if
+    # changes under src/content/test/gpu are made. (This rule
+    # typically only takes effect on the GPU bots.) To make sure this
+    # happens all the time, update an autogenerated text file in this
+    # directory.
+    with open(txt_filename, 'w') as fh:
+      print >> fh, '# AUTOGENERATED FILE - DO NOT EDIT'
+      print >> fh, '# SEE roll_webgl_conformance.py'
+      print >> fh, 'Current webgl revision %s' % commit_info.git_commit
+
   def _DeleteRollBranch(self):
     self._RunCommand(['git', 'checkout', 'master'])
     self._RunCommand(['git', 'branch', '-D', ROLL_BRANCH_NAME])
     logging.debug('Deleted the local roll branch (%s)', ROLL_BRANCH_NAME)
 
 
   def _GetBranches(self):
     """Returns a tuple of active,branches.
 
     The 'active' is the name of the currently active branch and 'branches' is a
@@ skipping 52 matching lines @@
     logging.basicConfig(level=logging.ERROR)
 
   autoroller = AutoRoller(SRC_DIR)
   if args.abort:
     return autoroller.Abort()
   else:
     return autoroller.PrepareRoll(args.ignore_checks, args.run_tryjobs)
 
 if __name__ == '__main__':
   sys.exit(main())