| Index: build/android/pylib/gtest/test_package_exe.py
 | 
| diff --git a/build/android/pylib/gtest/test_package_exe.py b/build/android/pylib/gtest/test_package_exe.py
 | 
| deleted file mode 100644
 | 
| index d03a596a69ed7206bcb7988162be64fe7ba222f1..0000000000000000000000000000000000000000
 | 
| --- a/build/android/pylib/gtest/test_package_exe.py
 | 
| +++ /dev/null
 | 
| @@ -1,163 +0,0 @@
 | 
| -# 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.
 | 
| -
 | 
| -"""Defines TestPackageExecutable to help run stand-alone executables."""
 | 
| -
 | 
| -import logging
 | 
| -import os
 | 
| -import posixpath
 | 
| -import sys
 | 
| -import tempfile
 | 
| -
 | 
| -from devil.android import device_errors
 | 
| -from devil.utils import cmd_helper
 | 
| -from pylib import constants
 | 
| -from pylib import pexpect
 | 
| -from pylib.gtest import gtest_test_instance
 | 
| -from pylib.gtest.test_package import TestPackage
 | 
| -
 | 
| -
 | 
| -class TestPackageExecutable(TestPackage):
 | 
| -  """A helper class for running stand-alone executables."""
 | 
| -
 | 
| -  _TEST_RUNNER_RET_VAL_FILE = 'gtest_retval'
 | 
| -
 | 
| -  def __init__(self, suite_name):
 | 
| -    """
 | 
| -    Args:
 | 
| -      suite_name: Name of the test suite (e.g. base_unittests).
 | 
| -    """
 | 
| -    TestPackage.__init__(self, suite_name)
 | 
| -    self.suite_path = os.path.join(constants.GetOutDirectory(), suite_name)
 | 
| -    self._symbols_dir = os.path.join(constants.GetOutDirectory(),
 | 
| -                                     'lib.target')
 | 
| -
 | 
| -  #override
 | 
| -  def GetGTestReturnCode(self, device):
 | 
| -    ret = None
 | 
| -    ret_code = 1  # Assume failure if we can't find it
 | 
| -    ret_code_file = tempfile.NamedTemporaryFile()
 | 
| -    try:
 | 
| -      if not device.PullFile(
 | 
| -          constants.TEST_EXECUTABLE_DIR + '/' +
 | 
| -          TestPackageExecutable._TEST_RUNNER_RET_VAL_FILE,
 | 
| -          ret_code_file.name):
 | 
| -        logging.critical('Unable to pull gtest ret val file %s',
 | 
| -                         ret_code_file.name)
 | 
| -        raise ValueError
 | 
| -      ret_code = file(ret_code_file.name).read()
 | 
| -      ret = int(ret_code)
 | 
| -    except ValueError:
 | 
| -      logging.critical('Error reading gtest ret val file %s [%s]',
 | 
| -                       ret_code_file.name, ret_code)
 | 
| -      ret = 1
 | 
| -    return ret
 | 
| -
 | 
| -  @staticmethod
 | 
| -  def _AddNativeCoverageExports(device):
 | 
| -    # export GCOV_PREFIX set the path for native coverage results
 | 
| -    # export GCOV_PREFIX_STRIP indicates how many initial directory
 | 
| -    #                          names to strip off the hardwired absolute paths.
 | 
| -    #                          This value is calculated in buildbot.sh and
 | 
| -    #                          depends on where the tree is built.
 | 
| -    # Ex: /usr/local/google/code/chrome will become
 | 
| -    #     /code/chrome if GCOV_PREFIX_STRIP=3
 | 
| -    try:
 | 
| -      depth = os.environ['NATIVE_COVERAGE_DEPTH_STRIP']
 | 
| -      export_string = ('export GCOV_PREFIX="%s/gcov"\n' %
 | 
| -                       device.GetExternalStoragePath())
 | 
| -      export_string += 'export GCOV_PREFIX_STRIP=%s\n' % depth
 | 
| -      return export_string
 | 
| -    except KeyError:
 | 
| -      logging.info('NATIVE_COVERAGE_DEPTH_STRIP is not defined: '
 | 
| -                   'No native coverage.')
 | 
| -      return ''
 | 
| -    except device_errors.CommandFailedError:
 | 
| -      logging.info('No external storage found: No native coverage.')
 | 
| -      return ''
 | 
| -
 | 
| -  #override
 | 
| -  def ClearApplicationState(self, device):
 | 
| -    device.KillAll(self.suite_name, blocking=True, timeout=30, quiet=True)
 | 
| -
 | 
| -  #override
 | 
| -  def CreateCommandLineFileOnDevice(self, device, test_filter, test_arguments):
 | 
| -    tool_wrapper = self.tool.GetTestWrapper()
 | 
| -    sh_script_file = tempfile.NamedTemporaryFile()
 | 
| -    # We need to capture the exit status from the script since adb shell won't
 | 
| -    # propagate to us.
 | 
| -    sh_script_file.write(
 | 
| -        'cd %s\n'
 | 
| -        '%s'
 | 
| -        '%s LD_LIBRARY_PATH=%s/%s_deps %s/%s --gtest_filter=%s %s\n'
 | 
| -        'echo $? > %s' %
 | 
| -        (constants.TEST_EXECUTABLE_DIR,
 | 
| -         self._AddNativeCoverageExports(device),
 | 
| -         tool_wrapper,
 | 
| -         constants.TEST_EXECUTABLE_DIR,
 | 
| -         self.suite_name,
 | 
| -         constants.TEST_EXECUTABLE_DIR,
 | 
| -         self.suite_name,
 | 
| -         test_filter, test_arguments,
 | 
| -         TestPackageExecutable._TEST_RUNNER_RET_VAL_FILE))
 | 
| -    sh_script_file.flush()
 | 
| -    cmd_helper.RunCmd(['chmod', '+x', sh_script_file.name])
 | 
| -    device.PushChangedFiles([(
 | 
| -        sh_script_file.name,
 | 
| -        constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh')])
 | 
| -    logging.info('Conents of the test runner script: ')
 | 
| -    for line in open(sh_script_file.name).readlines():
 | 
| -      logging.info('  ' + line.rstrip())
 | 
| -
 | 
| -  #override
 | 
| -  def GetAllTests(self, device):
 | 
| -    lib_path = posixpath.join(
 | 
| -        constants.TEST_EXECUTABLE_DIR, '%s_deps' % self.suite_name)
 | 
| -
 | 
| -    cmd = []
 | 
| -    if self.tool.GetTestWrapper():
 | 
| -      cmd.append(self.tool.GetTestWrapper())
 | 
| -    cmd.extend([
 | 
| -        posixpath.join(constants.TEST_EXECUTABLE_DIR, self.suite_name),
 | 
| -        '--gtest_list_tests'])
 | 
| -
 | 
| -    output = device.RunShellCommand(
 | 
| -        cmd, check_return=True, env={'LD_LIBRARY_PATH': lib_path})
 | 
| -    return gtest_test_instance.ParseGTestListTests(output)
 | 
| -
 | 
| -  #override
 | 
| -  def SpawnTestProcess(self, device):
 | 
| -    args = ['adb', '-s', str(device), 'shell', 'sh',
 | 
| -            constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh']
 | 
| -    logging.info(args)
 | 
| -    return pexpect.spawn(args[0], args[1:], logfile=sys.stdout)
 | 
| -
 | 
| -  #override
 | 
| -  def Install(self, device):
 | 
| -    if self.tool.NeedsDebugInfo():
 | 
| -      target_name = self.suite_path
 | 
| -    else:
 | 
| -      target_name = self.suite_path + '_stripped'
 | 
| -      if not os.path.isfile(target_name):
 | 
| -        raise Exception('Did not find %s, build target %s' %
 | 
| -                        (target_name, self.suite_name + '_stripped'))
 | 
| -
 | 
| -      target_mtime = os.stat(target_name).st_mtime
 | 
| -      source_mtime = os.stat(self.suite_path).st_mtime
 | 
| -      if target_mtime < source_mtime:
 | 
| -        raise Exception(
 | 
| -            'stripped binary (%s, timestamp %d) older than '
 | 
| -            'source binary (%s, timestamp %d), build target %s' %
 | 
| -            (target_name, target_mtime, self.suite_path, source_mtime,
 | 
| -             self.suite_name + '_stripped'))
 | 
| -
 | 
| -    test_binary_path = constants.TEST_EXECUTABLE_DIR + '/' + self.suite_name
 | 
| -    device.PushChangedFiles([(target_name, test_binary_path)])
 | 
| -    deps_path = self.suite_path + '_deps'
 | 
| -    if os.path.isdir(deps_path):
 | 
| -      device.PushChangedFiles([(deps_path, test_binary_path + '_deps')])
 | 
| -
 | 
| -  #override
 | 
| -  def PullAppFiles(self, device, files, directory):
 | 
| -    pass
 | 
| 
 |