Add support for content shell builder and extra layout tests parameters

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 json
 import multiprocessing
 import optparse
@@ skipping 169 matching lines @@
   buildbot_report.PrintNamedStep('webkit_lint')
   RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py',
           '--lint-test-files',
           '--chromium',
           '--target', target])
 
 
 def RunWebkitLayoutTests(options):
   """Run layout tests on an actual device."""
   buildbot_report.PrintNamedStep('webkit_tests')
-  RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py',
-          '--no-show-results',
-          '--no-new-test-results',
-          '--full-results-html',
-          '--clobber-old-results',
-          '--exit-after-n-failures', '5000',
-          '--exit-after-n-crashes-or-timeouts', '100',
-          '--debug-rwt-logging',
-          '--results-directory', '..layout-test-results',
-          '--target', options.target,
-          '--builder-name', options.build_properties.get('buildername', ''),
-          '--build-number', options.build_properties.get('buildnumber', ''),
-          '--master-name', options.build_properties.get('mastername', ''),
-          '--build-name', options.build_properties.get('buildername', ''),
-          '--platform=chromium-android',
-          '--test-results-server',
-          options.factory_properties.get('test_results_server', '')])
+  cmd_args = [
+        '--no-show-results',
+        '--no-new-test-results',
+        '--full-results-html',
+        '--clobber-old-results',
+        '--exit-after-n-failures', '5000',
+        '--exit-after-n-crashes-or-timeouts', '100',
+        '--debug-rwt-logging',
+        '--results-directory', '..layout-test-results',
+        '--target', options.target,
+        '--builder-name', options.build_properties.get('buildername', ''),
+        '--build-number', options.build_properties.get('buildnumber', ''),
+        '--master-name', options.build_properties.get('mastername', ''),
+        '--build-name', options.build_properties.get('buildername', ''),
+        '--platform=chromium-android']
+
+  for flag in 'test_results_server', 'driver_name', 'additional_drt_flag':
+    if flag in options.factory_properties:
+      cmd_args.extend(['--%s' % flag.replace('_', '-'),
+                       options.factory_properties.get(flag)])
+
+  for f in options.factory_properties.get('additional_expectations_files', []):
+    cmd_args.extend(['--additional-expectations-file',
+                     os.path.join(CHROME_SRC, *f)])
+
+  RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + cmd_args)
 
 
 def MainTestWrapper(options):
   # Restart adb to work around bugs, sleep to wait for usb discovery.
   RunCmd(['adb', 'kill-server'])
   RunCmd(['adb', 'start-server'])
   RunCmd(['sleep', '1'])
 
   # Spawn logcat monitor
   logcat_dir = os.path.join(CHROME_SRC, 'out/logcat')
@@ skipping 93 matching lines @@
       'slave', 'android'))
   if os.path.exists(build_internal_android):
     android_paths.insert(0, build_internal_android)
   os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']])
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))