Ignoring all results but chartjson on disabled benchmark run.

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 53 matching lines @@
     tempfile_dir = tempfile.mkdtemp('telemetry')
     valid = True
     failures = []
     chartjson_results_present = '--output-format=chartjson' in rest_args
     chartresults = None
     try:
       rc = common.run_command([sys.executable] + rest_args + [
         '--output-dir', tempfile_dir,
         '--output-format=json'
       ], env=env)
-      tempfile_name = os.path.join(tempfile_dir, 'results.json')
-      with open(tempfile_name) as f:
-        results = json.load(f)
-      for value in results['per_page_values']:
-        if value['type'] == 'failure':
-          failures.append(results['pages'][str(value['page_id'])]['name'])
-      valid = bool(rc == 0 or failures)
-      # If we have also output chartjson read it in and return it.
+            # If we have also output chartjson read it in and return it.

[Ken Russell (switch to Gerrit), 2016/10/03 21:20:49]

Strange indent?

       # results-chart.json is the file name output by telemetry when the
       # chartjson output format is included
       if chartjson_results_present:
         chart_tempfile_name = os.path.join(tempfile_dir, 'results-chart.json')
         with open(chart_tempfile_name) as f:
           chartresults = json.load(f)
+      # We need to get chartjson results first as this may be a disabled
+      # benchmark that was run
+      if (not chartjson_results_present or
+         (chartjson_results_present and chartresults.get('enabled', True))):
+        tempfile_name = os.path.join(tempfile_dir, 'results.json')
+        with open(tempfile_name) as f:
+          results = json.load(f)
+        for value in results['per_page_values']:
+          if value['type'] == 'failure':
+            failures.append(results['pages'][str(value['page_id'])]['name'])
+        valid = bool(rc == 0 or failures)
+
     except Exception:
       traceback.print_exc()
       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.
@@ skipping 23 matching lines @@
 
 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())