Fix formatting of dom perf test output so ref scores show up properly....

buildbot/scripts/slave/chromium/dom_perf.py

 #!/usr/bin/python
 # 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.
 
 """A tool to run the dom perf tests, used by the buildbot slaves.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
   For a list of command-line options, call this script with '--help'.
 """
 
 import logging
 import optparse
 import os
 import sys
 
 import chromium_utils
 import simplejson as json
 import slave_utils
 
 # So we can import google.*_utils below with native Pythons.
 sys.path.append(os.path.abspath('src/tools/python'))
 
 USAGE = '%s [options]' % os.path.basename(sys.argv[0])
 
 URL = 'file:///%s/run.html?run=all%s&reportInJS=1&tags=buildbot_trunk,revision_%s'
 
-def print_result(top, name, score_string):
+def print_result(top, name, score_string, refbuild):
   prefix = ''
   if top:
     prefix = '*'
   score = int(round(float(score_string)))
-  print ('%sRESULT %s: score= %d score (bigger is better)' %
-         (prefix, name, score))
+  score_label = 'score'
+  if refbuild:
+    score_label = 'score_ref'
+  print ('%sRESULT %s: %s= %d score (bigger is better)' %
+         (prefix, name, score_label, score))
 
 def main(options, args):
   """Using the target build configuration, run the dom perf test."""
 
   build_dir = os.path.abspath(options.build_dir)
   if chromium_utils.IsWindows():
     test_exe_name = 'url_fetch_test.exe'
   else:
     test_exe_name = 'url_fetch_test'
   if chromium_utils.IsMac():
@@ skipping 41 matching lines @@
 
     print "Executing: "
     print command
     result = chromium_utils.RunCommand(command)
 
     # Open the resulting file and display it.
     file = open(output_file, 'r')
     data = json.loads(''.join(file.readlines()))
     file.close()
 
-    name = 'Total'
-    if use_refbuild:
-      name += '_ref'
-    print_result(True, name, data['BenchmarkRun']['totalScore'])
+    print_result(True, 'Total', data['BenchmarkRun']['totalScore'], 
+                 use_refbuild)
     for suite in data['BenchmarkSuites']:
-      name = suite['name']
-      if use_refbuild:
-        name += '_ref'
-      print_result(False, name, suite['score'])
+      print_result(False, suite['name'], suite['score'], use_refbuild)
 
     return result
 
   result = run_and_print(False)
   result &= run_and_print(True)
 
   if chromium_utils.IsLinux():
     slave_utils.StopVirtualX(options.target)
 
   return result
@@ skipping 10 matching lines @@
   option_parser = optparse.OptionParser(usage=USAGE)
 
   option_parser.add_option('', '--target', default='Release',
                            help='build target (Debug or Release)')
   option_parser.add_option('', '--build-dir', default='chrome',
                            help='path to main build directory (the parent of '
                                 'the Release or Debug directory)')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))