Porting relevant legacy conversion code from performance_lp to src side

testing/scripts/run_gtest_perf_test.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 isolated non-Telemetry perf test .
 
 The main contract is that the caller passes the arguments:
 
   --isolated-script-test-output=[FILENAME]
@@ skipping 11 matching lines @@
 import argparse
 import json
 import os
 import shutil
 import sys
 import tempfile
 import traceback
 
 import common
 
+
+def GetChromiumSrcDir():
+  return os.path.abspath(
+      os.path.join(os.path.abspath(__file__), '..', '..', '..'))
+
+def GetPerfDir():
+  return os.path.join(GetChromiumSrcDir(), 'tools', 'perf')
+# Add src/tools/perf wheree generate_legacy_perf_dashboard_json.py lives

[Ken Russell (switch to Gerrit), 2016/11/04 15:16:16]

typo: wheree

[eyaich1, 2016/11/04 17:33:02]

Done.

+sys.path.append(GetPerfDir())
+
+import generate_legacy_perf_dashboard_json
+
 # Add src/testing/ into sys.path for importing xvfb.
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import xvfb
 
 # Unfortunately we need to copy these variables from ../test_env.py.
 # Importing it and using its get_sandbox_env breaks test runs on Linux
 # (it seems to unset DISPLAY).
 CHROME_SANDBOX_ENV = 'CHROME_DEVEL_SANDBOX'
 CHROME_SANDBOX_PATH = '/opt/chromium/chrome_sandbox'
 
@@ skipping 29 matching lines @@
 
   try:
     valid = True
     rc = 0
     try:
       executable = rest_args[0]
       if IsWindows():
         executable = '.\%s.exe' % executable
       else:
         executable = './%s' % executable
+      with common.temporary_file() as tempfile_path:
+        valid = (common.run_command_with_output([executable],
+          env=env, stdoutfile=tempfile_path) == 0)

[eakuefner, 2016/11/04 16:58:56]

style nit: indent +4 spaces instead of +2.

[eyaich1, 2016/11/04 17:33:02]

Done.

 
-      rc = common.run_command_with_output([executable] + [
-        '--write-abbreviated-json-results-to', args.isolated_script_test_output,
-      ], env=env, stdoutfile=args.isolated_script_test_chartjson_output)
-
-      # Now get the correct json format from the stdout to write to the
-      # perf results file
+        # Now get the correct json format from the stdout to write to the
+        # perf results file
+        results_processor = \

[eakuefner, 2016/11/04 16:58:56]

style nit: no backslash line continuations in python[0] -- use parens if you
need to.

[0] https://google.github.io/styleguide/pyguide.html#Line_length

[eyaich1, 2016/11/04 17:33:02]

Done.

+            generate_legacy_perf_dashboard_json.LegacyResultsProcessor()
+        charts = results_processor.GenerateJsonResults(tempfile_path)
+        # Write the returned encoded json to a the charts output file
+        with open(args.isolated_script_test_chartjson_output, 'w') as f:
+          f.write(charts)
     except Exception:
       traceback.print_exc()
       valid = False
 
-    if not valid:
-      failures = ['(entire test suite)']
-      with open(args.isolated_script_test_output, 'w') as fp:
-        json.dump({
-            'valid': valid,
-            'failures': failures,
-        }, fp)
+    failures = [] if valid else ['(entire test suite)']
+    with open(args.isolated_script_test_output, 'w') as fp:
+      json.dump({
+          'valid': valid,
+          'failures': failures,
+      }, fp)
 
     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())