Relands test_runner.py, updates buildbot scripts

build/android/pylib/gtest/test_package_executable.py

 # 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 shutil
 import sys
 import tempfile
 
 from pylib import cmd_helper
 from pylib import constants
 from pylib import pexpect
@@ skipping 67 matching lines @@
 
   def GetAllTests(self):
     """Returns a list of all tests available in the test suite."""
     all_tests = self.adb.RunShellCommand(
         '%s %s/%s --gtest_list_tests' %
         (self.tool.GetTestWrapper(),
          constants.TEST_EXECUTABLE_DIR,
          self.test_suite_basename))
     return self._ParseGTestListTests(all_tests)
 
-  def CreateTestRunnerScript(self, gtest_filter, test_arguments):
+  def CreateTestRunnerScript(self, test_filter, test_arguments):
     """Creates a test runner script and pushes to the device.
 
     Args:
-      gtest_filter: A gtest_filter flag.
+      test_filter: A test_filter flag.
       test_arguments: Additional arguments to pass to the test binary.
     """
     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 %s/%s --gtest_filter=%s %s\n'
                          'echo $? > %s' %
                          (constants.TEST_EXECUTABLE_DIR,
                           self._AddNativeCoverageExports(),
                           tool_wrapper, constants.TEST_EXECUTABLE_DIR,
                           self.test_suite_basename,
-                          gtest_filter, test_arguments,
+                          test_filter, test_arguments,
                           TestPackageExecutable._TEST_RUNNER_RET_VAL_FILE))
     sh_script_file.flush()
     cmd_helper.RunCmd(['chmod', '+x', sh_script_file.name])
     self.adb.PushIfNeeded(
-            sh_script_file.name,
-            constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh')
+        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())
 
   def RunTestsAndListResults(self):
     """Runs all the tests and checks for failures.
 
     Returns:
       A TestRunResults object.
     """
@@ skipping 29 matching lines @@
             os.makedirs(self.symbols_dir)
           shutil.copy(self.test_suite, self.symbols_dir)
         strip = os.environ['STRIP']
         cmd_helper.RunCmd([strip, self.test_suite, '-o', target_name])
     test_binary = constants.TEST_EXECUTABLE_DIR + '/' + self.test_suite_basename
     self.adb.PushIfNeeded(target_name, test_binary)
 
   def _GetTestSuiteBaseName(self):
     """Returns the  base name of the test suite."""
     return os.path.basename(self.test_suite)