Increase Android test robustness.

build/android/test_package_executable.py

 # Copyright (c) 2011 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.
 
 
 import logging
 import os
 import pexpect
 import shutil
 import sys
@@ skipping 25 matching lines @@
       dump_debug_info: A debug_info object.
       symbols_dir: Directory to put the stripped binaries.
     """
     TestPackage.__init__(self, adb, device, test_suite, timeout,
                          rebaseline, performance_test, cleanup_test_files,
                          tool, dump_debug_info)
     self.symbols_dir = symbols_dir
 
   def _GetGTestReturnCode(self):
     ret = None
+    ret_code = 1  # Assume failure if we can't find it
     ret_code_file = tempfile.NamedTemporaryFile()
     try:
       if not self.adb.Adb().Pull(
           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:
@@ skipping 42 matching lines @@
                          '%s /data/local/%s --gtest_filter=%s %s\n'
                          'echo $? > %s' %
                          (self._AddNativeCoverageExports(),
                           tool_wrapper, self.test_suite_basename,
                           gtest_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,
                           '/data/local/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 TestResults object.
     """
     args = ['adb', '-s', self.device, 'shell', 'sh',
             '/data/local/chrome_test_runner.sh']
     logging.info(args)
@@ skipping 25 matching lines @@
         # Whenever we generate a stripped binary, copy to the symbols dir. If we
         # aren't stripping a new binary, assume it's there.
         if self.symbols_dir:
           if not os.path.exists(self.symbols_dir):
             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 = '/data/local/' + self.test_suite_basename
     self.adb.PushIfNeeded(target_name, test_binary)