diff options
| author | dpranke <dpranke@chromium.org> | 2015-02-07 16:09:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-08 00:10:30 +0000 |
| commit | 6aac98abee2bb3a1a1a3d6a526a417219dbc9375 (patch) | |
| tree | 49178a6b70e2691de624db4e3dd23d88a1636e20 /build/android | |
| parent | 260c79f53e5af23f6f1189fe7f9ffe14760eec85 (diff) | |
| download | chromium_src-6aac98abee2bb3a1a1a3d6a526a417219dbc9375.zip chromium_src-6aac98abee2bb3a1a1a3d6a526a417219dbc9375.tar.gz chromium_src-6aac98abee2bb3a1a1a3d6a526a417219dbc9375.tar.bz2 | |
Revert #315148 "[Android] Convert ContentShellTest.apk to isolate."
This reverts commit 4cf59ffaa830d5edad26a439ba13f07ce0447394.
This patch appears to break the contentshell_instrumentation_tests on
the chromium.webkit waterfall. I'm not sure what to do about this,
as the .webkit tests appear to be run in a completely different
way than the .linux (main waterfall) tests, but I'm reverting this
for now and we can sort it out later.
TBR=jbudorick@chromium.org, maruel@chromium.org
BUG=400499
> Author: jbudorick <jbudorick@chromium.org>
> Date: Fri Feb 6 16:43:24 2015 -0800
>
> [Android] Convert ContentShellTest.apk to isolate.
>
> We were previously using --test-data to push files from
> //content/test/data/android/device_files to
> $EXTERNAL_STORAGE/chrome/test/data/content. Switching to isolate lets
> us handle all of our instrumentation and gtest data dependencies in the
> same way. It will also facilitate using isolate to optimize transfers
> between builders and testers.
>
> BUG=400499
> TBR=maruel@chromium.org
>
> Review URL: https://codereview.chromium.org/878163004
>
> Cr-Commit-Position: refs/heads/master@{#315148}
Review URL: https://codereview.chromium.org/886993003
Cr-Commit-Position: refs/heads/master@{#315220}
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/pylib/instrumentation/setup.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/android/pylib/instrumentation/setup.py b/build/android/pylib/instrumentation/setup.py index bdde80d..8dacc3d 100644 --- a/build/android/pylib/instrumentation/setup.py +++ b/build/android/pylib/instrumentation/setup.py @@ -89,15 +89,15 @@ def Setup(test_options, devices): if test_options.test_data: device_utils.DeviceUtils.parallel(devices).pMap( _PushDataDeps, test_options) - - if test_options.isolate_file_path: + else: base_setup.GenerateDepsDirUsingIsolate(test_options.test_apk, test_options.isolate_file_path, ISOLATE_FILE_PATHS, DEPS_EXCLUSION_LIST) def push_data_deps_to_device_dir(device): - base_setup.PushDataDeps(device, device.GetExternalStoragePath(), - test_options) + device_dir = os.path.join(device.GetExternalStoragePath(), + DEVICE_DATA_DIR) + base_setup.PushDataDeps(device, device_dir, test_options) device_utils.DeviceUtils.parallel(devices).pMap( push_data_deps_to_device_dir) |