Outputing json test results to output.json

testing/scripts/run_telemetry_benchmark_as_googletest.py

 #!/usr/bin/env python
 # Copyright 2015 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 an isolate bundled Telemetry benchmark.
 
 This script attempts to emulate the contract of gtest-style tests
 invoked via recipes. The main contract is that the caller passes the
 argument:
@@ skipping 48 matching lines @@
   if args.xvfb and xvfb.should_start_xvfb(env):
     xvfb_proc, openbox_proc, xcompmgr_proc = xvfb.start_xvfb(env=env,
                                                              build_dir='.')
     assert xvfb_proc and openbox_proc and xcompmgr_proc, 'Failed to start xvfb'
   try:
     tempfile_dir = tempfile.mkdtemp('telemetry')
     valid = True
     failures = []
     chartjson_results_present = '--output-format=chartjson' in rest_args
     chartresults = None
+    json_test_results_present = '--output-format=json-test-results' in rest_args
+    json_test_results = None
 
     results = None
     try:
       rc = common.run_command([sys.executable] + rest_args + [
         '--output-dir', tempfile_dir,
         '--output-format=json'
       ], env=env)
             # If we have also output chartjson read it in and return it.
       # results-chart.json is the file name output by telemetry when the
       # chartjson output format is included
@@ skipping 11 matching lines @@
         for value in results['per_page_values']:
           if value['type'] == 'failure':
             page_data = results['pages'][str(value['page_id'])]
             name = page_data.get('name')
             if not name:
               name = page_data['url']
 
             failures.append(name)
         valid = bool(rc == 0 or failures)
 
+      if json_test_results_present:
+        tempfile_name = os.path.join(tempfile_dir, 'test-results.json')
+        with open(tempfile_name) as f:
+          json_test_results = json.load(f)
+
     except Exception:
       traceback.print_exc()
       if results:
         print 'results, which possibly caused exception: %s' % json.dumps(
             results, indent=2)
       valid = False
     finally:
       shutil.rmtree(tempfile_dir)
 
     if not valid and not failures:
       failures = ['(entire test suite)']
       if rc == 0:
         rc = 1  # Signal an abnormal exit.
 
     if chartjson_results_present and args.isolated_script_test_chartjson_output:
       chartjson_output_file = \
         open(args.isolated_script_test_chartjson_output, 'w')
       json.dump(chartresults, chartjson_output_file)
 
-    json.dump({
-        'valid': valid,
-        'failures': failures
-    }, args.isolated_script_test_output)
+    if not json_test_results_present:
+      json_test_results = {
+          'valid': valid,
+          'failures': failures
+      }
+
+    json.dump(json_test_results, args.isolated_script_test_output)
     return rc
 
   finally:
     xvfb.kill(xvfb_proc)
     xvfb.kill(openbox_proc)
     xvfb.kill(xcompmgr_proc)
 
 
 # This is not really a "script test" so does not need to manually add
 # any additional compile targets.
 def main_compile_targets(args):
   json.dump([], args.output)
 
 
 if __name__ == '__main__':
   # Conform minimally to the protocol defined by ScriptTest.
   if 'compile_targets' in sys.argv:
     funcs = {
       'run': None,
       'compile_targets': main_compile_targets,
     }
     sys.exit(common.run_script(sys.argv[1:], funcs))
   sys.exit(main())