diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/single_test_runner.py | 1 | ||||
| -rw-r--r-- | build/android/test_package.py | 10 | ||||
| -rw-r--r-- | build/android/test_package_executable.py | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/build/android/single_test_runner.py b/build/android/single_test_runner.py index eb68b56..48e92ea3 100644 --- a/build/android/single_test_runner.py +++ b/build/android/single_test_runner.py @@ -215,6 +215,7 @@ class SingleTestRunner(BaseTestRunner): def StripAndCopyFiles(self): """Strips and copies the required data files for the test suite.""" self.test_package.StripAndCopyExecutable() + self.test_package.PushDataAndPakFiles() self.test_package.tool.CopyFiles() test_data = self.GetDataFilesForTestSuite() if test_data and not self.fast_and_loose: diff --git a/build/android/test_package.py b/build/android/test_package.py index 2d07de4..92c3da1 100644 --- a/build/android/test_package.py +++ b/build/android/test_package.py @@ -38,7 +38,8 @@ class TestPackage(object): self.test_suite_full = test_suite self.test_suite = os.path.splitext(test_suite)[0] self.test_suite_basename = self._GetTestSuiteBaseName() - self.test_suite_dirname = os.path.dirname(self.test_suite) + self.test_suite_dirname = os.path.dirname( + self.test_suite.split(self.test_suite_basename)[0]); self.rebaseline = rebaseline self.performance_test = performance_test self.cleanup_test_files = cleanup_test_files @@ -122,6 +123,13 @@ class TestPackage(object): ret += [current + test_name] return ret + def PushDataAndPakFiles(self): + 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 _WatchTestOutput(self, p): """Watches the test output. Args: diff --git a/build/android/test_package_executable.py b/build/android/test_package_executable.py index bf341cb..270b90e 100644 --- a/build/android/test_package_executable.py +++ b/build/android/test_package_executable.py @@ -152,12 +152,6 @@ class TestPackageExecutable(TestPackage): 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) |