bisect-builds.py: Support for bisecting official builds for win64 and mac64 platforms.

tools/bisect-builds.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Snapshot Build Bisect Tool
 
 This script bisects a snapshot archive using binary search. It starts at
 a bad revision (it will try to guess HEAD) and asks for a last known-good
 revision. It will then binary search across this revision range by downloading,
@@ skipping 59 matching lines @@
 # Search pattern to be matched in the json output from
 # BLINK_GITHASH_TO_SVN_URL to get the blink revision (svn revision).
 BLINK_SEARCH_PATTERN = (
     r'.*git-svn-id: svn://svn.chromium.org/blink/trunk@(\d+) ')
 
 SEARCH_PATTERN = {
     'chromium': CHROMIUM_SEARCH_PATTERN,
     'blink': BLINK_SEARCH_PATTERN,
 }
 
+CREDENTIAL_ERROR_MESSAGE = ('You are attempting to access protected data with '
+                            'no configured credentials')
+
 ###############################################################################
 
 import httplib
 import json
 import optparse
 import os
 import re
 import shlex
 import shutil
 import subprocess
@@ skipping 37 matching lines @@
     # It uses "git svn find-rev <SHA1>" command to convert git hash to svn
     # revision number.
     self.use_local_repo = use_local_repo
 
     # Set some internal members:
     #   _listing_platform_dir = Directory that holds revisions. Ends with a '/'.
     #   _archive_extract_dir = Uncompressed directory in the archive_name file.
     #   _binary_name = The name of the executable to run.
     if self.platform in ('linux', 'linux64', 'linux-arm'):
       self._binary_name = 'chrome'
-    elif self.platform == 'mac':
+    elif self.platform in ('mac', 'mac64'):
       self.archive_name = 'chrome-mac.zip'
       self._archive_extract_dir = 'chrome-mac'
-    elif self.platform == 'win':
+    elif self.platform in ('win', 'win64'):
       self.archive_name = 'chrome-win32.zip'
       self._archive_extract_dir = 'chrome-win32'
       self._binary_name = 'chrome.exe'
     else:
       raise Exception('Invalid platform: %s' % self.platform)
 
     if is_official:
       if self.platform == 'linux':
         self._listing_platform_dir = 'precise32/'
         self.archive_name = 'chrome-precise32.zip'
         self._archive_extract_dir = 'chrome-precise32'
       elif self.platform == 'linux64':
         self._listing_platform_dir = 'precise64/'
         self.archive_name = 'chrome-precise64.zip'
         self._archive_extract_dir = 'chrome-precise64'
       elif self.platform == 'mac':
         self._listing_platform_dir = 'mac/'
         self._binary_name = 'Google Chrome.app/Contents/MacOS/Google Chrome'
+      elif self.platform == 'mac64':
+        self._listing_platform_dir = 'mac64/'
+        self._binary_name = 'Google Chrome.app/Contents/MacOS/Google Chrome'
       elif self.platform == 'win':
         self._listing_platform_dir = 'win/'
         self.archive_name = 'chrome-win.zip'
         self._archive_extract_dir = 'chrome-win'
+      elif self.platform == 'win64':
+        self._listing_platform_dir = 'win64/'
+        self.archive_name = 'chrome-win64.zip'
+        self._archive_extract_dir = 'chrome-win64'
     else:
       if self.platform in ('linux', 'linux64', 'linux-arm'):
         self.archive_name = 'chrome-linux.zip'
         self._archive_extract_dir = 'chrome-linux'
         if self.platform == 'linux':
           self._listing_platform_dir = 'Linux/'
         elif self.platform == 'linux64':
           self._listing_platform_dir = 'Linux_x64/'
         elif self.platform == 'linux-arm':
           self._listing_platform_dir = 'Linux_ARM_Cross-Compile/'
@@ skipping 244 matching lines @@
         print ('Follow the instructions in this document '
                'http://dev.chromium.org/developers/how-tos/install-depot-tools'
                ' to install depot_tools and then try again.')
         sys.exit(1)
       gsutil_path = os.path.join(gsutil_path, 'third_party', 'gsutil', 'gsutil')
       gsutil = subprocess.Popen([sys.executable, gsutil_path] + args,
                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                                 env=None)
       stdout, stderr = gsutil.communicate()
       if gsutil.returncode:
-        if re.findall(r'status[ |=]40[1|3]', stderr):
+        if (re.findall(r'status[ |=]40[1|3]', stderr) or
+            stderr.startswith(CREDENTIAL_ERROR_MESSAGE)):
           print ('Follow these steps to configure your credentials and try'
                  ' running the bisect-builds.py again.:\n'
                  '  1. Run "python %s config" and follow its instructions.\n'
                  '  2. If you have a @google.com account, use that account.\n'
                  '  3. For the project-id, just enter 0.' % gsutil_path)
           sys.exit(1)
         else:
-          raise Exception('Error running the gsutil command')
+          raise Exception('Error running the gsutil command: %s' % stderr)
       return stdout
 
     def GsutilList(bucket):
       query = 'gs://%s/' % bucket
       stdout = RunGsutilCommand(['ls', query])
       return [url[len(query):].strip('/') for url in stdout.splitlines()]
 
     # Download the revlist and filter for just the range between good and bad.
     minrev = min(self.good_revision, self.bad_revision)
     maxrev = max(self.good_revision, self.bad_revision)
@@ skipping 500 matching lines @@
            '  Official versions (e.g. 1.0.1000.0) for official builds. (-o)\n'
            '  SVN revisions (e.g. 123456) for chromium builds, from trunk.\n'
            '    Use base_trunk_revision from http://omahaproxy.appspot.com/\n'
            '    for earlier revs.\n'
            '    Chrome\'s about: build number and omahaproxy branch_revision\n'
            '    are incorrect, they are from branches.\n'
            '\n'
            'Tip: add "-- --no-first-run" to bypass the first run prompts.')
   parser = optparse.OptionParser(usage=usage)
   # Strangely, the default help output doesn't include the choice list.
-  choices = ['mac', 'win', 'linux', 'linux64', 'linux-arm']
+  choices = ['mac', 'mac64', 'win', 'win64', 'linux', 'linux64', 'linux-arm']
             # linux-chromiumos lacks a continuous archive http://crbug.com/78158
   parser.add_option('-a', '--archive',
                     choices=choices,
                     help='The buildbot archive to bisect [%s].' %
                          '|'.join(choices))
   parser.add_option('-o',
                     action='store_true',
                     dest='official_builds',
                     help='Bisect across official Chrome builds (internal '
                          'only) instead of Chromium archives.')
@@ skipping 167 matching lines @@
 
     print 'CHANGELOG URL:'
     if opts.official_builds:
       print OFFICIAL_CHANGELOG_URL % (min_chromium_rev, max_chromium_rev)
     else:
       print '  ' + CHANGELOG_URL % (min_chromium_rev, max_chromium_rev)
 
 
 if __name__ == '__main__':
   sys.exit(main())