Run telemetry_gpu_unittests via isolate on "Linux Tests" and trybot.

infra/scripts/runtest_wrapper.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.
 
 """Wrapper for runtest.py, makes it possible to control src-side
 which file gets used and test the changes on trybots before landing."""
 
 
 import argparse
 import copy
 import os
 import subprocess
 import sys
 
 
 SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 
 def main(argv):
   parser = argparse.ArgumentParser()
   # TODO(phajdan.jr): Remove after cleaning up build repo side.
   parser.add_argument(
       '--path-build', help='Path to the build repo')
-  parser.add_argument('args', nargs='*', help='Arguments to pass to runtest.py')
+  parser.add_argument('args', nargs=argparse.REMAINDER,
+                      help='Arguments to pass to runtest.py')
   args = parser.parse_args(argv)
+  runtest_args = args.args
+  if runtest_args[0] == '--':

[Paweł Hajdan Jr., 2015/09/24 14:29:22]

Wait, why is this logic needed?

I wouldn't mind too much if this was some code specific to your test, but this
wrapper would live at least for some time (and I have further cleanup plans
related to it).

I might be able to suggest something here or even fix things myself - for now
however, I'd just like to understand what you're trying to do.

[nednguyen, 2015/09/24 15:54:54]

To use the isolate_script_test, we need to add the extra command args "--
--isolated-script-test-output" to the arguments list passed to
runtest_wrapper.py.

With the original logic, nargs='*' will skip all the "--" in the command line
arguments. (see the log in
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

Therefore I need to modify parser.add_argument('args', nargs='*'..) to
parser.add_argument('args', nargs=argparse.REMAINDER..).

However, the argument we pass to runtest_wrapper is: 
"--path-build /b/build -- --target Release --xvfb...", which means using
argparse.REMAINDER keep the "--" right before "--isolated-script-test-output",
but also the one right before "--target".

Hence I need to strip out the starting "--" here.

+    runtest_args.pop(0)
 
   env = copy.copy(os.environ)
   # Reset PYTHONPATH to make sure we're not accidentally using
   # the buildbot-provided value and build-side modules. That would make
   # changes inside this directory not take effect on buildbot.
   pythonpath = []
   pythonpath.append(os.path.join(
       SRC_DIR, 'infra', 'scripts', 'legacy', 'scripts'))
   pythonpath.append(os.path.join(
       SRC_DIR, 'infra', 'scripts', 'legacy', 'site_config'))
   pythonpath.append(os.path.join(
       SRC_DIR, 'third_party'))
   env['PYTHONPATH'] = os.pathsep.join(pythonpath)
 
   return subprocess.call([
       sys.executable,
       os.path.join(SRC_DIR, 'infra', 'scripts', 'legacy',
                    'scripts', 'slave', 'runtest.py')
-  ] + args.args, env=env)
+  ] + runtest_args, env=env)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))