Update from https://crrev.com/306655

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 34 matching lines @@
 option:
   --device: the serial number to be passed to all adb commands.
 """
 
 import collections
 import datetime
 import json
 import logging
 import os
 import pickle
+import shutil
 import sys
+import tempfile
 import threading
 import time
 
 from pylib import cmd_helper
 from pylib import constants
 from pylib import forwarder
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.device import device_errors
 
 
 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):
   """Helper method to print the output of previously executed test_name.
 
   Args:
     test_name: name of the test that has been previously executed.
 
   Returns:
     exit code generated by the test step.
   """
   file_name = os.path.join(constants.PERF_OUTPUT_DIR, test_name)
@@ skipping 75 matching lines @@
       max_shards: the maximum shard index.
       tests: a dict mapping test_name to command.
       flaky_tests: a list of flaky test_name.
     """
     super(TestRunner, self).__init__(device, None, 'Release')
     self._options = test_options
     self._shard_index = shard_index
     self._max_shard = max_shard
     self._tests = tests
     self._flaky_tests = flaky_tests
+    self._output_dir = None
 
   @staticmethod
   def _IsBetter(result):
     if result['actual_exit_code'] == 0:
       return True
     pickled = os.path.join(constants.PERF_OUTPUT_DIR,
                            result['name'])
     if not os.path.exists(pickled):
       return True
     with file(pickled, 'r') as f:
@@ skipping 10 matching lines @@
   def _CheckDeviceAffinity(self, test_name):
     """Returns True if test_name has affinity for this shard."""
     affinity = (self._tests['steps'][test_name]['device_affinity'] %
                 self._max_shard)
     if self._shard_index == affinity:
       return True
     logging.info('Skipping %s on %s (affinity is %s, device is %s)',
                  test_name, self.device_serial, affinity, self._shard_index)
     return False
 
+  def _CleanupOutputDirectory(self):
+    if self._output_dir:
+      shutil.rmtree(self._output_dir, ignore_errors=True)
+      self._output_dir = None
+
+  def _ReadChartjsonOutput(self):
+    if not self._output_dir:
+      return ''
+
+    json_output_path = os.path.join(self._output_dir, 'results-chart.json')
+    with open(json_output_path) as f:
+      return f.read()
+
   def _LaunchPerfTest(self, test_name):
     """Runs a perf test.
 
     Args:
       test_name: the name of the test to be executed.
 
     Returns:
       A tuple containing (Output, base_test_result.ResultType)
     """
     if not self._CheckDeviceAffinity(test_name):
       return '', base_test_result.ResultType.PASS
 
     try:
       logging.warning('Unmapping device ports')
       forwarder.Forwarder.UnmapAllDevicePorts(self.device)
       self.device.old_interface.RestartAdbdOnDevice()
     except Exception as e:
       logging.error('Exception when tearing down device %s', e)
 
     cmd = ('%s --device %s' %
            (self._tests['steps'][test_name]['cmd'],
             self.device_serial))
+
+    if self._options.collect_chartjson_data:
+      self._output_dir = tempfile.mkdtemp()
+      cmd = cmd + ' --output-dir=%s' % self._output_dir
+
     logging.info('%s : %s', test_name, cmd)
     start_time = datetime.datetime.now()
 
     timeout = 5400
     if self._options.no_timeout:
       timeout = None
     full_cmd = cmd
     if self._options.dry_run:
       full_cmd = 'echo %s' % cmd
 
     logfile = sys.stdout
     if self._options.single_step:
       # Just print a heart-beat so that the outer buildbot scripts won't timeout
       # without response.
       logfile = _HeartBeatLogger()
     cwd = os.path.abspath(constants.DIR_SOURCE_ROOT)
     if full_cmd.startswith('src/'):
       cwd = os.path.abspath(os.path.join(constants.DIR_SOURCE_ROOT, os.pardir))
     try:
       exit_code, output = cmd_helper.GetCmdStatusAndOutputWithTimeout(
           full_cmd, timeout, cwd=cwd, shell=True, logfile=logfile)
+      json_output = self._ReadChartjsonOutput()
     except cmd_helper.TimeoutError as e:
       exit_code = -1
       output = str(e)
+      json_output = ''
     finally:
+      self._CleanupOutputDirectory()
       if self._options.single_step:
         logfile.stop()
     end_time = datetime.datetime.now()
     if exit_code is None:
       exit_code = -1
     logging.info('%s : exit_code=%d in %d secs at %s',
                  test_name, exit_code, (end_time - start_time).seconds,
                  self.device_serial)
 
     if exit_code == 0:
@@ skipping 12 matching lines @@
     if test_name in self._flaky_tests:
       # The exit_code is used at the second stage when printing the
       # test output. If the test is flaky, force to "0" to get that step green
       # whilst still gathering data to the perf dashboards.
       # The result_type is used by the test_dispatcher to retry the test.
       exit_code = 0
 
     persisted_result = {
         'name': test_name,
         'output': output,
+        'chartjson': json_output,
         'exit_code': exit_code,
         'actual_exit_code': actual_exit_code,
         'result_type': result_type,
         'total_time': (end_time - start_time).seconds,
         'device': self.device_serial,
         'cmd': cmd,
     }
     self._SaveResult(persisted_result)
 
     return (output, result_type)
 
   def RunTest(self, test_name):
     """Run a perf test on the device.
 
     Args:
       test_name: String to use for logging the test result.
 
     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