| Index: build/android/test_package.py
|
| diff --git a/build/android/test_package.py b/build/android/test_package.py
|
| index 2d07de496e73bc880caec46ceb56434af244cd44..92c3da1f82b8f37e51908f8f8f49531305a1b33f 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:
|
|
|