build-bisect: minor usability tweaks

build/build-bisect.py

 #!/usr/bin/python2.5
 # Copyright (c) 2009 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 94 matching lines @@
     urllib.urlretrieve(download_url, BUILD_ZIP_NAME)
   except Exception, e:
     print("Could not retrieve the download. Sorry.")
     sys.exit(-1)
 
   # Unzip the file.
   print 'Unzipping ...'
   os.system("unzip -q %s" % BUILD_ZIP_NAME)
 
   # Tell the system to open the app.
-  print 'Running %s/%s/%s' % (os.getcwd(), BUILD_DIR_NAME, BUILD_EXE_NAME)
+  flags = '--user-data-dir=profile'
+  print 'Running %s/%s/%s %s' % (os.getcwd(), BUILD_DIR_NAME, BUILD_EXE_NAME,
+                                 flags)
   if BUILD_ARCHIVE_TYPE in ('linux', 'linux-64'):
-    os.system("%s/%s" % (BUILD_DIR_NAME, BUILD_EXE_NAME))
+    os.system("%s/%s %s" % (BUILD_DIR_NAME, BUILD_EXE_NAME, flags))
   elif BUILD_ARCHIVE_TYPE in ('mac'):
-    os.system("open %s/%s" % (BUILD_DIR_NAME, BUILD_EXE_NAME))
+    os.system("open %s/%s %s" % (BUILD_DIR_NAME, BUILD_EXE_NAME, flags))
   elif BUILD_ARCHIVE_TYPE in ('xp'):
     # TODO(mmoss) Does Windows need 'start' or something?
-    os.system("%s/%s" % (BUILD_DIR_NAME, BUILD_EXE_NAME))
+    os.system("%s/%s %s" % (BUILD_DIR_NAME, BUILD_EXE_NAME, flags))
 
   os.chdir(cwd)
   print 'Cleaning temp dir ...'
   try:
     shutil.rmtree(tempdir, True)
   except Exception, e:
     pass
 
 def AskIsGoodBuild(rev):
   """Annoyingly ask the user whether build |rev| is good or bad."""
   while True:
     check = raw_input("\nBuild %d is [(g)ood/(b)ad]: " % int(rev))[0]
     if (check == "g" or check  == "b"):
       return (check == "g")
     else:
       print("Just answer the question...")
 
 def main():
   usage = ('%prog [options]\n'
            'Perform binary search on the snapshot builds.')
   parser = optparse.OptionParser(usage=usage)
+  # Strangely, the default help output doesn't include the choice list.
+  choices = ['mac', 'xp', 'linux', 'linux-64']
   parser.add_option('-a', '--archive',
-                    choices = ['mac', 'xp', 'linux', 'linux-64'],
-                    help = 'The buildbot archive to bisect.')
+                    choices = choices,
+                    help = 'The buildbot archive to bisect [%s].' %
+                           '|'.join(choices))
   parser.add_option('-b', '--bad', type = 'int',
                     help = 'The bad revision to bisect to.')
   parser.add_option('-g', '--good', type = 'int',
                     help = 'The last known good revision to bisect from.')
   (opts, args) = parser.parse_args()
 
   if opts.archive is None:
     parser.print_help()
     return 1
 
@@ skipping 66 matching lines @@
     else:
       bad = test
 
   # We're done. Let the user know the results in an official manner.
   print("You are probably looking for build %d." % revlist[bad])
   print("This is the ViewVC URL for the potential bustage:")
   print(BUILD_VIEWVC_URL % revlist[bad])
 
 if __name__ == '__main__':
   sys.exit(main())