Add suite specific options argument to Android test bot.

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 hashlib
 import json
 import os
@@ skipping 97 matching lines @@
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   if options.gtest_filter:
     args.append('--gtest-filter=%s' % options.gtest_filter)
   for suite in suites:
     bb_annotations.PrintNamedStep(suite)
     cmd = ['build/android/test_runner.py', 'gtest', '-s', suite] + args
     if suite == 'content_browsertests':
       cmd.append('--num_retries=1')
+    elif suite == 'clank_unittests':
+      cmd += ['--isolate_file_path',
+              '"./clank/native/framework/clank_unittests.isolate"']

[jbudorick, 2014/05/21 23:31:04]

I don't think we want this hard-coded upstream (or downstream, for that matter).

This should either be accomplished by an extra argument to RunTestSuites, as
you've mentioned, or by adding to options, e.g.:

if options.isolate_file:
  args.extend(['--isolate_file_path', options.isolate_file])

[Kibeom Kim (inactive), 2014/05/21 23:41:24]

options argument seems like a global option that is being applied to all the
suites passed in, so instead I added suites_options.

Here is how downstream calls it
https://chrome-internal-review.googlesource.com/#/c/164153/2/build/buildbot/b...
.

Actually, this doesn't look that ideal since clank_unittests always requires the
--isolate_file_path option and it's better to be tied together.

     RunCmd(cmd)
 
 
 def RunChromeDriverTests(options):
   """Run all the steps for running chromedriver tests."""
   bb_annotations.PrintNamedStep('chromedriver_annotation')
   RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
           '--android-packages=%s,%s,%s,%s' %
           ('chrome_shell',
            'chrome_stable',
@@ skipping 523 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))