diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 15:32:44 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 15:32:44 +0000 |
| commit | b7e61f54df561175b9c935c6663a32ced451cbf5 (patch) | |
| tree | 8f80a20c5d75f0c6ac84fa39afa92d19f606542e /build | |
| parent | 316c1e5e4e64a41d9b276c92c7951ec5c438b724 (diff) | |
| download | chromium_src-b7e61f54df561175b9c935c6663a32ced451cbf5.zip chromium_src-b7e61f54df561175b9c935c6663a32ced451cbf5.tar.gz chromium_src-b7e61f54df561175b9c935c6663a32ced451cbf5.tar.bz2 | |
[Android] Add support for layering device-located test files.
We need to split test files copied to devices by layers to avoid
content or webview tests using files from chrome layer directory.
To avoid modifying existing tests, test files from all layers are
merged into a single directory on a device.
Review URL: https://chromiumcodereview.appspot.com/10933011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/run_java_tests.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/build/android/pylib/run_java_tests.py b/build/android/pylib/run_java_tests.py index 448fd42..bf51bad 100644 --- a/build/android/pylib/run_java_tests.py +++ b/build/android/pylib/run_java_tests.py @@ -162,12 +162,17 @@ class TestRunner(BaseTestRunner): logging.warning('Already copied test files to device %s, skipping.', self.device) return - host_test_files_path = (constants.CHROME_DIR + - '/chrome/test/data/android/device_files') - if os.path.exists(host_test_files_path): - self.adb.PushIfNeeded(host_test_files_path, - self.adb.GetExternalStorage() + '/' + - TestRunner._DEVICE_DATA_DIR) + host_test_files = [ + ('android_webview/test/data/device_files', 'webview'), + ('content/test/data/android/device_files', 'content'), + ('chrome/test/data/android/device_files', 'chrome') + ] + for (host_src, dst_layer) in host_test_files: + host_test_files_path = constants.CHROME_DIR + '/' + host_src + if os.path.exists(host_test_files_path): + self.adb.PushIfNeeded(host_test_files_path, + self.adb.GetExternalStorage() + '/' + + TestRunner._DEVICE_DATA_DIR + '/' + dst_layer) if self.install_apk: for apk in self.apks: self.adb.ManagedInstall(apk.GetApkPath(), |