Updating isolate scripts to read in chartjson telemetry results

testing/scripts/run_gpu_integration_test_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 GPU integration test.
 
 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 28 matching lines @@
 CHROME_SANDBOX_ENV = 'CHROME_DEVEL_SANDBOX'
 CHROME_SANDBOX_PATH = '/opt/chromium/chrome_sandbox'
 
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument(
       '--isolated-script-test-output', type=str,
       required=True)
   parser.add_argument('--xvfb', help='Start xvfb.', action='store_true')
   args, rest_args = parser.parse_known_args()
+  # Remove the chartjson extra arg until this script cares about chartjson
+  # results from telemetry
+  index = 0
+  for arg in rest_args:
+    if '--isolated-script-test-chartjson-output' in arg:
+      rest_args.pop(index)
+      break
+    index += 1

[Ken Russell (switch to Gerrit), 2016/09/19 20:27:57]

It's not necessary to manually extract it -- adding it as a non-optional
argument like in run_telemetry_benchmark_as_googletest.py , and then ignoring
it, would be preferable, since then it's going through the same argument parsing
logic.

[eyaich1, 2016/09/20 12:52:02]

Done.

+
   xvfb_proc = None
   openbox_proc = None
   xcompmgr_proc = None
   env = os.environ.copy()
   # Assume we want to set up the sandbox environment variables all the
   # time; doing so is harmless on non-Linux platforms and is needed
   # all the time on Linux.
   env[CHROME_SANDBOX_ENV] = CHROME_SANDBOX_PATH
   if args.xvfb and xvfb.should_start_xvfb(env):
     xvfb_proc, openbox_proc, xcompmgr_proc = xvfb.start_xvfb(env=env,
@@ skipping 49 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())