Add WebRTC test configurations for Android testing.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import glob
 import multiprocessing
 import os
 import shutil
@@ skipping 46 matching lines @@
       'ChromiumTestShellTest',
       'chrome:chrome/test/data/android/device_files',
       constants.CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR),
     I('AndroidWebView',
       'AndroidWebView.apk',
       'org.chromium.android_webview.shell',
       'AndroidWebViewTest',
       'webview:android_webview/test/data/device_files'),
     ])
 
-VALID_TESTS = set(['chromedriver', 'ui', 'unit', 'webkit', 'webkit_layout'])
+VALID_TESTS = set(['chromedriver', 'ui', 'unit', 'webkit', 'webkit_layout',
+                   'webrtc'])
 
 RunCmd = bb_utils.RunCmd
 
 
 # multiprocessing map_async requires a top-level function for pickle library.
 def RebootDeviceSafe(device):
   """Reboot a device, wait for it to start, and squelch timeout exceptions."""
   try:
     android_commands.AndroidCommands(device).Reboot(True)
   except errors.DeviceUnresponsiveError as e:
@@ skipping 201 matching lines @@
 def RunInstrumentationTests(options):
   for test in INSTRUMENTATION_TESTS.itervalues():
     RunInstrumentationSuite(options, test)
 
 
 def RunWebkitTests(options):
   RunTestSuites(options, [gtest_config.Apk('webkit_unit_tests')])
   RunWebkitLint(options.target)
 
 
+def RunWebRTCTests(options):
+  RunTestSuites(options, gtest_config.WEBRTC_TEST_SUITES)
+
 def GetTestStepCmds():

[Isaac (away), 2013/07/31 21:49:09]

2 newlines between top-level functions

[kjellander_chromium, 2013/08/05 11:24:03]

Done.

   return [
       ('chromedriver', RunChromeDriverTests),
       ('unit', RunUnitTests),
       ('ui', RunInstrumentationTests),
       ('webkit', RunWebkitTests),
-      ('webkit_layout', RunWebkitLayoutTests)
+      ('webkit_layout', RunWebkitLayoutTests),
+      ('webrtc', RunWebRTCTests),
   ]
 
 
 def LogcatDump(options):
   # Print logcat, kill logcat monitor
   bb_annotations.PrintNamedStep('logcat_dump')
   logcat_file = os.path.join(CHROME_SRC, 'out', options.target, 'full_log')
   with open(logcat_file, 'w') as f:
     RunCmd([
         os.path.join(CHROME_SRC, 'build', 'android', 'adb_logcat_printer.py'),
@@ skipping 77 matching lines @@
     return sys.exit('Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
 
   MainTestWrapper(options)
   provision_devices.KillHostHeartbeat()
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))