Android: adds "test_runner.py perf -vvv --single-step" in telemetry.py

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
 import sys
 
 from common import chromium_utils
 from slave import build_directory
 
 
 SCRIPT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 
 
 def _GetPythonTestCommand(py_script, target, arg_list=None,
-                         wrapper_args=None, fp=None):
+                          wrapper_args=None, fp=None):
   """Synthesizes a command line to run runtest.py."""
   cmd = [sys.executable,
          os.path.join(SCRIPT_DIR, 'slave', 'runtest.py'),
          '--run-python-script',
          '--target', target,
          '--no-xvfb'] #  telemetry.py should be run by a 'master' runtest.py
                       #  which starts xvfb on linux.
   if fp:
     cmd.extend(["--factory-properties=%s" % json.dumps(fp)])
   if wrapper_args is not None:
@@ skipping 43 matching lines @@
   # List of command line arguments common to all test platforms.
   common_args = ['-v', '--output-format=buildbot']
 
   if profile_type:
     profile_dir = os.path.join(
         build_dir, target, 'generated_profile', profile_type)
     common_args.append('--profile-dir=' + profile_dir)
   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 = []
+  commands = []
 
   # Run the test against the target chrome build.
   browser = target.lower()
+  wrapper_args = None
   if target_os == 'android':
     browser = options.target_android_browser
+    wrapper_args = ['src/build/android/test_runner.py', 'perf', '-v',
+                    '--single-step']
   # If an executable is passed, use that instead.
   if browser_exe:
     browser_info = ['--browser=exact',
                     '--browser-executable=%s' % browser_exe]
   else:
     browser_info = ['--browser=%s' % browser]
   test_args = list(common_args)
   test_args.extend(browser_info)
   test_args.extend(test_specification)
-  test_cmd = _GetPythonTestCommand(script, target, test_args, fp=fp)
+  test_cmd = _GetPythonTestCommand(script, target, test_args,
+                                   wrapper_args=wrapper_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'])
       test_args.extend(browser_info)
@@ skipping 50 matching lines @@
       continue
 
     retval = chromium_utils.RunCommand(command, env=env)
     if retval != 0:
       break
   return retval
 
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))