diff options
| author | navabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 02:40:13 +0000 |
|---|---|---|
| committer | navabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 02:40:13 +0000 |
| commit | 3356038b649edd7c95f2fc9f49d7e42da3372c73 (patch) | |
| tree | dd3cc9f8b58e7172c5405bcf1de2b33a0415c08f /build | |
| parent | 6ac7597f930c6456ff09dd426ba1d657c8a85e90 (diff) | |
| download | chromium_src-3356038b649edd7c95f2fc9f49d7e42da3372c73.zip chromium_src-3356038b649edd7c95f2fc9f49d7e42da3372c73.tar.gz chromium_src-3356038b649edd7c95f2fc9f49d7e42da3372c73.tar.bz2 | |
ChromeDriver has pre-installed APK's, thus should not wipe during provisioning.
BUG=383106
TBR=craigdh@chromium.org
Review URL: https://codereview.chromium.org/332093003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/buildbot/bb_device_steps.py | 4 | ||||
| -rwxr-xr-x | build/android/buildbot/bb_run_bot.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py index 29a4add..de70d80 100755 --- a/build/android/buildbot/bb_device_steps.py +++ b/build/android/buildbot/bb_device_steps.py @@ -412,6 +412,8 @@ def ProvisionDevices(options): provision_cmd = ['build/android/provision_devices.py', '-t', options.target] if options.auto_reconnect: provision_cmd.append('--auto-reconnect') + if options.skip_wipe: + provision_cmd.append('--skip-wipe') RunCmd(provision_cmd) @@ -647,6 +649,8 @@ def GetDeviceStepsOptParser(): parser.add_option( '--auto-reconnect', action='store_true', help='Push script to device which restarts adbd on disconnections.') + parser.add_option('--skip-wipe', action='store_true', + help='Do not wipe devices during provisioning.') parser.add_option( '--logcat-dump-output', help='The logcat dump output will be "tee"-ed into this file') diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py index d2a6010..dfed382 100755 --- a/build/android/buildbot/bb_run_bot.py +++ b/build/android/buildbot/bb_run_bot.py @@ -151,7 +151,7 @@ def GetBotStepMap(): T(std_tests, ['--asan', '--asan-symbolize'])), B('blink-try-builder', H(compile_step)), B('chromedriver-fyi-tests-dbg', H(std_test_steps), - T(['chromedriver'], ['--install=ChromeShell'])), + T(['chromedriver'], ['--install=ChromeShell', '--skip-wipe'])), B('fyi-x86-builder-dbg', H(compile_step + std_host_tests, experimental, target_arch='x86')), B('fyi-builder-dbg', |