Print correct name in get_drt

tools/get_drt.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # Gets or updates a DumpRenderTree (a nearly headless build of chrome). This is
 # used for running browser tests of client applications.
 
 import optparse
@@ skipping 80 matching lines @@
 * You need to do a one-time configuration step to access Google Storage.
 * Please run this command and follow the instructions:
 *     %s config
 *
 * NOTE: When prompted you can leave "project-id" blank. Just hit enter.
 *******************************************************************************
 ''' % GSUTIL
     sys.exit(1)
 
 
-def get_latest(directory, version_file, latest_pattern, permanent_prefix):
+def get_latest(name, directory, version_file, latest_pattern, permanent_prefix):
   """Get the latest DumpRenderTree or Dartium binary depending on arguments.
 
   Args:
     directory: target directory (recreated) to install binary
     version_file: name of file with the current version stamp
     latest_pattern: the google store url pattern pointing to the latest binary
     permanent_prefix: stable google store folder used to download versions
   """
   system = platform.system()
   if system == 'Darwin':
     osname = 'mac'
   elif system == 'Linux':
     osname = 'lucid64'
   else:
     print >>sys.stderr, ('WARNING: platform "%s" does not support'
-        'DumpRenderTree for tests') % system
+        '%s for tests') % (system, name)
     return 0
 
   ensure_config()
 
   # Query for the lastest version
   pattern = latest_pattern  % { 'osname' : osname }
   result, out = gsutil('ls', pattern)
   if result == 0:
     latest = out.split()[-1]
     # use permanent link instead, just in case the latest zip entry gets deleted
     # while we are downloading it.
     latest = (permanent_prefix % { 'osname' : osname }
               + latest[latest.rindex('/'):])
   else: # e.g. no access
-    print "Couldn't download DumpRenderTree: %s\n%s" % (pattern, out)
+    print "Couldn't download %s: %s\n%s" % (name, pattern, out)
     if not os.path.exists(version_file):
-      print "Tests using DumpRenderTree will not work. Please try again later."
+      print "Tests using %s will not work. Please try again later." % name
     return 0
 
   # Check if we need to update the file
   if os.path.exists(version_file):
     v = open(version_file, 'r').read()
     if v == latest:
       if not in_runhooks():
-        print 'DumpRenderTree is up to date.\nVersion: ' + latest
+        print name + ' is up to date.\nVersion: ' + latest
       return 0 # up to date
 
   if os.path.exists(directory):
-    print 'Removing old DumpRenderTree tree %s' % directory
+    print 'Removing old %s tree %s' % (name, directory)
     shutil.rmtree(directory)
 
   # download the zip file to a temporary path, and unzip to the target location
   temp_dir = tempfile.mkdtemp()
   try:
     temp_zip = temp_dir + '/drt.zip'
     # It's nice to show download progress
     gsutil_visible('cp', latest, temp_zip)
 
     result, out = execute_command('unzip', temp_zip, '-d', temp_dir)
@@ skipping 15 matching lines @@
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('--dartium', dest='dartium',
                     help='Get latest Dartium', action='store_true',
                     default=False)
   args, _ = parser.parse_args()
 
   if args.dartium:
-    get_latest(DARTIUM_DIR, DARTIUM_VERSION,
+    get_latest('Dartium', DARTIUM_DIR, DARTIUM_VERSION,
                DARTIUM_LATEST_PATTERN, DARTIUM_PERMANENT_PREFIX)
   else:
-    get_latest(DRT_DIR, DRT_VERSION, DRT_LATEST_PATTERN, DRT_PERMANENT_PREFIX)
+    get_latest('DumpRenderTree', DRT_DIR, DRT_VERSION,
+               DRT_LATEST_PATTERN, DRT_PERMANENT_PREFIX)
 
 if __name__ == '__main__':
   sys.exit(main())