Fix build/android/run_tests.sh

build/android/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
@@ skipping 55 matching lines @@
     #                          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="/data/local/gcov"\n'
+    export_string = 'export GCOV_PREFIX="/data/local/tmp/gcov"\n'
     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(
-        '/data/local/%s --gtest_list_tests' % self.test_suite_basename)
+        '/data/local/tmp/%s --gtest_list_tests' % self.test_suite_basename)
     return self._ParseGTestListTests(all_tests)
 
   def CreateTestRunnerScript(self, gtest_filter, test_arguments):
     """Creates a test runner script and pushes to the device.
 
     Args:
       gtest_filter: A gtest_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 /data/local\n'
+    sh_script_file.write('cd /data/local/tmp\n'
                          '%s'
-                         '%s /data/local/%s --gtest_filter=%s %s\n'
+                         '%s /data/local/tmp/%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')
+                          '/data/local/tmp/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']
+            '/data/local/tmp/chrome_test_runner.sh']
     logging.info(args)
     p = pexpect.spawn(args[0], args[1:], logfile=sys.stdout)
     return self._WatchTestOutput(p)
 
   def StripAndCopyExecutable(self):
     """Strips and copies the executable to the device."""
     if self.tool.NeedsDebugInfo():
       target_name = self.test_suite
     else:
       target_name = self.test_suite + '_' + self.device + '_stripped'
@@ skipping 11 matching lines @@
         logging.info('Did not find up-to-date stripped binary. Generating a '
                      'new one (%s).' % target_name)
         # 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
+    test_binary = '/data/local/tmp/' + self.test_suite_basename
     self.adb.PushIfNeeded(target_name, test_binary)
 
     if self.test_suite_basename == 'ui_unittests':
       self.adb.PushIfNeeded(self.test_suite_dirname + '/chrome.pak',
                             '/data/local/tmp/paks/chrome.pak')
       self.adb.PushIfNeeded(self.test_suite_dirname + '/locales/en-US.pak',
                             '/data/local/tmp/paks/en-US.pak')
 
   def _GetTestSuiteBaseName(self):
     """Returns the  base name of the test suite."""
     return os.path.basename(self.test_suite)