Android: do not run telemetry directly.

scripts/slave/telemetry.py

 #! /usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Set up and invoke telemetry tests."""
 
 import json
 import optparse
 import os
@@ skipping 44 matching lines @@
 def _GenerateTelemetryCommandSequence(options):
   """Given a test name, page set, and target, generate a telemetry test seq."""
   fp = options.factory_properties
   test_name = fp.get('test_name')
   extra_args = fp.get('extra_args')
   target = fp.get('target')
   target_os = fp.get('target_os')
   target_platform = fp.get('target_platform')
   build_dir = fp.get('build_dir')
 
-  script = os.path.join('src', 'tools', 'perf', 'run_benchmark')
-
   test_specification = [test_name]
 
-  env = os.environ
-
+  commands = []
   # List of command line arguments common to all test platforms.
   common_args = ['-v', '--output-format=buildbot']
   if extra_args:
     common_args.extend(extra_args)
 
-  # On android, telemetry needs to use the adb command and needs to be in
-  # root mode. Run it in bash since envsetup.sh doesn't work in sh.
-  if target_os == 'android':
-    env['PATH'] = os.pathsep.join(['/b/build_internal/scripts/slave/android',
-                                   env['PATH']])
-    commands = [['adb', 'root'], ['adb', 'wait-for-device']]
-  else:
-    commands = []
-
   # Run the test against the target chrome build.
   browser = target.lower()
   if target_os == 'android':
-    browser = options.target_android_browser
-  test_args = list(common_args)
-  test_args.append('--browser=%s' % browser)
-  test_args.extend(test_specification)
+    script = os.path.join('src', 'build', 'android', 'test_runner.py')
+    test_args = ['perf', '--print', test_name]
+  else:
+    script = os.path.join('src', 'tools', 'perf', 'run_benchmark')
+    test_args = list(common_args)
+    test_args.append('--browser=%s' % browser)
+    test_args.extend(test_specification)
   test_cmd = _GetPythonTestCommand(script, target, build_dir, test_args, fp=fp)
   commands.append(test_cmd)
 
   # Run the test against the target chrome build for different user profiles on
   # certain page cyclers.
   if target_os != 'android':
     if test_name in ('page_cycler_moz', 'page_cycler_morejs'):
       test_args = list(common_args)
       test_args.extend(['--profile-type=typical_user',
                         '--output-trace-tag=_extcs1', '--browser=%s' % browser])
@@ skipping 14 matching lines @@
   ref_build = _GetReferenceBuildPath(target_os, target_platform)
   if ref_build and fp.get('run_reference_build', True):
     ref_args = list(common_args)
     ref_args.extend(['--browser=exact',
                 '--browser-executable=%s' % ref_build,
                 '--output-trace-tag=_ref'])
     ref_args.extend(test_specification)
     ref_cmd = _GetPythonTestCommand(script, target, build_dir, ref_args, fp=fp)
     commands.append(ref_cmd)
 
-  return commands, env
+  return commands
 
 
 def main(argv):
   prog_desc = 'Invoke telemetry performance tests.'
   parser = optparse.OptionParser(usage=('%prog [options]' + '\n\n' + prog_desc))
   parser.add_option('--print-cmd', action='store_true',
                     help='only print command instead of running it')
   parser.add_option('--target-android-browser',
                     default='android-chromium-testshell',
                     help='target browser used on Android')
   parser.add_option('--factory-properties', action='callback',
                     callback=chromium_utils.convert_json, type='string',
                     nargs=1, default={},
                     help='factory properties in JSON format')
 
   options, _ = parser.parse_args(argv[1:])
   if not options.factory_properties:
     print 'This program requires a factory properties to run.'
     return 1
 
-  commands, env = _GenerateTelemetryCommandSequence(options)
+  commands = _GenerateTelemetryCommandSequence(options)
 
   retval = 0
   for command in commands:
     if options.print_cmd:
       print ' '.join("'%s'" % c for c in command)
       continue
 
-    retval = chromium_utils.RunCommand(command, env=env)
+    retval = chromium_utils.RunCommand(command)
     if retval != 0:
       break
   return retval
 
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))