Roll Chrome into Mojo.

build/android/pylib/perf/test_runner.py

 # Copyright 2013 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.
 
 """Runs perf tests.
 
 Our buildbot infrastructure requires each slave to run steps serially.
 This is sub-optimal for android, where these steps can run independently on
 multiple connected devices.
 
@@ skipping 57 matching lines @@
 
 def OutputJsonList(json_input, json_output):
   with file(json_input, 'r') as i:
     all_steps = json.load(i)
   step_names = all_steps['steps'].keys()
   with file(json_output, 'w') as o:
     o.write(json.dumps(step_names))
   return 0
 
 
-def OutputChartjson(test_name, json_file_name):
-  file_name = os.path.join(constants.PERF_OUTPUT_DIR, test_name)
-  with file(file_name, 'r') as f:
-    persisted_result = pickle.load(f)
-  with open(json_file_name, 'w') as o:
-    o.write(persisted_result['chartjson'])
-
-
-def PrintTestOutput(test_name):
+def PrintTestOutput(test_name, json_file_name=None):
   """Helper method to print the output of previously executed test_name.
 
   Args:
     test_name: name of the test that has been previously executed.
+    json_file_name: name of the file to output chartjson data to.
 
   Returns:
     exit code generated by the test step.
   """
   file_name = os.path.join(constants.PERF_OUTPUT_DIR, test_name)
   if not os.path.exists(file_name):
     logging.error('File not found %s', file_name)
     return 1
 
   with file(file_name, 'r') as f:
     persisted_result = pickle.loads(f.read())
   logging.info('*' * 80)
   logging.info('Output from:')
   logging.info(persisted_result['cmd'])
   logging.info('*' * 80)
   print persisted_result['output']
 
+  if json_file_name:
+    with file(json_file_name, 'w') as f:
+      f.write(persisted_result['chartjson'])
+
   return persisted_result['exit_code']
 
 
 def PrintSummary(test_names):
   logging.info('*' * 80)
   logging.info('Sharding summary')
   device_total_time = collections.defaultdict(int)
   for test_name in test_names:
     file_name = os.path.join(constants.PERF_OUTPUT_DIR, test_name)
     if not os.path.exists(file_name):
@@ skipping 212 matching lines @@
     Returns:
       A tuple of (TestRunResults, retry).
     """
     _, result_type = self._LaunchPerfTest(test_name)
     results = base_test_result.TestRunResults()
     results.AddResult(base_test_result.BaseTestResult(test_name, result_type))
     retry = None
     if not results.DidRunPass():
       retry = test_name
     return results, retry