diff options
author | kjellander@chromium.org <kjellander@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 12:21:41 +0000 |
---|---|---|
committer | kjellander@chromium.org <kjellander@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-27 12:21:41 +0000 |
commit | 072414940357abff52558f794af018adfeb6f0d7 (patch) | |
tree | ea410f418120035a105a792036464589ff1e6e1a | |
parent | fc361199aea9d89b190d11cc12565930cad39253 (diff) | |
download | chromium_src-072414940357abff52558f794af018adfeb6f0d7.zip chromium_src-072414940357abff52558f794af018adfeb6f0d7.tar.gz chromium_src-072414940357abff52558f794af018adfeb6f0d7.tar.bz2 |
Get WebRTC resources on Android Testers.
I know it is a bit ugly to invoke a script in the WebRTC
checkout like this to download the resources that are needed
for the WebRTC tests, but it's the only way to do this until we've
found a better solution that works both when WebRTC is built
standalone and as a part of Chrome.
I'm working on a better way of downloading the resources
in http://review.webrtc.org/2095004/
There's no easy way to include these files into the archive
built by zip_build.py since script is made to only include files that
are located in the build_dir (e.g. out/Release).
BUG=webrtc:1882
TEST=ran a local build.
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/23075028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219774 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-x | build/android/buildbot/bb_host_steps.py | 7 | ||||
-rwxr-xr-x | build/android/buildbot/bb_run_bot.py | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/build/android/buildbot/bb_host_steps.py b/build/android/buildbot/bb_host_steps.py index adb9ca0..e27ba08 100755 --- a/build/android/buildbot/bb_host_steps.py +++ b/build/android/buildbot/bb_host_steps.py @@ -102,12 +102,19 @@ def BisectPerfRegression(_): '-w', os.path.join(constants.DIR_SOURCE_ROOT, os.pardir)]) +def DownloadWebRTCResources(_): + bb_annotations.PrintNamedStep('download_resources') + RunCmd([SrcPath('third_party', 'webrtc', 'tools', 'update_resources.py'), + '-p', '../../../'], halt_on_failure=True) + + def GetHostStepCmds(): return [ ('compile', Compile), ('extract_build', ExtractBuild), ('check_webview_licenses', CheckWebViewLicenses), ('bisect_perf_regression', BisectPerfRegression), + ('download_webrtc_resources', DownloadWebRTCResources), ('findbugs', FindBugs), ('zip_build', ZipBuild) ] diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py index 9e2efbe..11a917f 100755 --- a/build/android/buildbot/bb_run_bot.py +++ b/build/android/buildbot/bb_run_bot.py @@ -171,7 +171,8 @@ def GetBotStepMap(): H(std_build_steps, extra_args=['--build-targets=android_builder_webrtc'], extra_gyp='include_tests=1 enable_tracing=1')), - B('webrtc-tests', H(std_test_steps), T(['webrtc'], [flakiness_server])), + B('webrtc-tests', H(['download_webrtc_resources'] + std_test_steps), + T(['webrtc'], [flakiness_server])), # Generic builder config (for substring match). B('builder', H(std_build_steps)), |