diff options
| author | kjellander@chromium.org <kjellander@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 08:18:29 +0000 |
|---|---|---|
| committer | kjellander@chromium.org <kjellander@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 08:18:29 +0000 |
| commit | 640afed478986ceb76dd7cfbd1e9c479a963a5e3 (patch) | |
| tree | e0c6fc15c5ac1ccea3dcd90a45dd3327c3aeeeb4 /build/android | |
| parent | 61b1133d360732b5e3f9deb6f184f124f3793cab (diff) | |
| download | chromium_src-640afed478986ceb76dd7cfbd1e9c479a963a5e3.zip chromium_src-640afed478986ceb76dd7cfbd1e9c479a963a5e3.tar.gz chromium_src-640afed478986ceb76dd7cfbd1e9c479a963a5e3.tar.bz2 | |
Build support for WebRTC Chromium tests on Android.
In addition to the native APK tests for WebRTC, we
want to build and test the content_browsertests test
for each revision of WebRTC in our Chromium WebRTC FYI
waterfall.
This CL adds the needed configurations for that, that are used
by the buildbots in: https://codereview.chromium.org/26702005/
NOTRY=True
TEST=presubmit
BUG=305749
Review URL: https://codereview.chromium.org/26738003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rwxr-xr-x | build/android/buildbot/bb_device_steps.py | 13 | ||||
| -rwxr-xr-x | build/android/buildbot/bb_run_bot.py | 12 | ||||
| -rw-r--r-- | build/android/pylib/gtest/gtest_config.py | 6 |
3 files changed, 23 insertions, 8 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py index 232d119..f80a2a4 100755 --- a/build/android/buildbot/bb_device_steps.py +++ b/build/android/buildbot/bb_device_steps.py @@ -73,7 +73,7 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [ ]) VALID_TESTS = set(['chromedriver', 'gpu', 'ui', 'unit', 'webkit', - 'webkit_layout', 'webrtc']) + 'webkit_layout', 'webrtc_chromium', 'webrtc_native']) RunCmd = bb_utils.RunCmd @@ -425,8 +425,12 @@ def RunWebkitTests(options): RunWebkitLint(options.target) -def RunWebRTCTests(options): - RunTestSuites(options, gtest_config.WEBRTC_TEST_SUITES) +def RunWebRTCChromiumTests(options): + RunTestSuites(options, gtest_config.WEBRTC_CHROMIUM_TEST_SUITES) + + +def RunWebRTCNativeTests(options): + RunTestSuites(options, gtest_config.WEBRTC_NATIVE_TEST_SUITES) def RunGPUTests(options): @@ -454,7 +458,8 @@ def GetTestStepCmds(): ('ui', RunInstrumentationTests), ('webkit', RunWebkitTests), ('webkit_layout', RunWebkitLayoutTests), - ('webrtc', RunWebRTCTests), + ('webrtc_chromium', RunWebRTCChromiumTests), + ('webrtc_native', RunWebRTCNativeTests), ] diff --git a/build/android/buildbot/bb_run_bot.py b/build/android/buildbot/bb_run_bot.py index dbe453a..10a6df1 100755 --- a/build/android/buildbot/bb_run_bot.py +++ b/build/android/buildbot/bb_run_bot.py @@ -169,12 +169,18 @@ def GetBotStepMap(): B('webkit-latest-contentshell', H(compile_step), T(['webkit_layout'], ['--auto-reconnect'])), B('builder-unit-tests', H(compile_step), T(['unit'])), - B('webrtc-builder', + B('webrtc-chromium-builder', + H(std_build_steps, + extra_args=['--build-targets=content_browsertests_apk'])), + B('webrtc-native-builder', H(std_build_steps, extra_args=['--build-targets=android_builder_webrtc'], extra_gyp='include_tests=1 enable_tracing=1')), - B('webrtc-tests', H(['download_webrtc_resources'] + std_test_steps), - T(['webrtc'], [flakiness_server])), + B('webrtc-chromium-tests', H(std_test_steps), + T(['webrtc_chromium'], [flakiness_server])), + B('webrtc-native-tests', + H(['download_webrtc_resources'] + std_test_steps), + T(['webrtc_native'], [flakiness_server])), # Generic builder config (for substring match). B('builder', H(std_build_steps)), diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py index b677761..c373ed9 100644 --- a/build/android/pylib/gtest/gtest_config.py +++ b/build/android/pylib/gtest/gtest_config.py @@ -33,7 +33,11 @@ STABLE_TEST_SUITES = [ 'sandbox_linux_unittests', ] -WEBRTC_TEST_SUITES = [ +WEBRTC_CHROMIUM_TEST_SUITES = [ + 'content_browsertests', +] + +WEBRTC_NATIVE_TEST_SUITES = [ 'audio_decoder_unittests', 'common_audio_unittests', 'common_video_unittests', |