Android: upstream latest changes for build/android.

build/android/pylib/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.
 
 
 import logging
 import os
 import pexpect
 import shutil
 import sys
 import tempfile
 
 import cmd_helper
 import constants
 from test_package import TestPackage
 
 
 class TestPackageExecutable(TestPackage):
   """A helper class for running stand-alone executables."""
 
-  _TEST_RUNNER_RET_VAL_FILE = constants.TEST_DATA_DIR + '/gtest_retval'
+  _TEST_RUNNER_RET_VAL_FILE = 'gtest_retval'
 
   def __init__(self, adb, device, test_suite, timeout, rebaseline,
                performance_test, cleanup_test_files, tool, dump_debug_info,
                symbols_dir=None):
     """
     Args:
       adb: ADB interface the tests are using.
       device: Device to run the tests.
       test_suite: A specific test suite to run, empty to run all.
       timeout: Timeout for each test.
       rebaseline: Whether or not to run tests in isolation and update the
           filter.
       performance_test: Whether or not performance test(s).
       cleanup_test_files: Whether or not to cleanup test files on device.
       tool: Name of the Valgrind tool.
       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):
+          self.adb.GetExternalStorage() + '/' +
+          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
 
   def _AddNativeCoverageExports(self):
     # 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']
     except KeyError:
       logging.info('NATIVE_COVERAGE_DEPTH_STRIP is not defined: '
                    'No native coverage.')
       return ''
-    export_string = 'export GCOV_PREFIX="%s/gcov"\n' % constants.TEST_DATA_DIR
+    export_string = ('export GCOV_PREFIX="%s/gcov"\n' %
+                     self.adb.GetExternalStorage())
     export_string += 'export GCOV_PREFIX_STRIP=%s\n' % depth
     return export_string
 
   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))
@@ skipping 67 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)