Chromium Code Reviews| Index: build/android/buildbot/bb_device_steps.py |
| diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py |
| index 1d0ba35fff139a91054d01bf46ae16ff7c710ec9..7d1c6bf08638dea2feeeae5b99e5c34ed95c92ad 100755 |
| --- a/build/android/buildbot/bb_device_steps.py |
| +++ b/build/android/buildbot/bb_device_steps.py |
| @@ -96,6 +96,30 @@ def _GetRevision(options): |
| return revision |
| +def _RunTest(options, cmd, suite): |
| + """Run test command with runtest.py. |
| + |
| + Args: |
| + options: options object. |
| + cmd: the command to run. |
| + suite: test name. |
| + """ |
| + property_args = bb_utils.EncodeProperties(options) |
| + args = [os.path.join(SLAVE_SCRIPTS_DIR, 'runtest.py'), |
| + '--no-xvfb', |
|
jbudorick
2014/07/23 14:23:12
style nit: continuation lines should be indented 4
qyearsley
2014/07/23 18:56:38
Note: Passing --no-xvfb appears to have no effect
zty
2014/07/23 19:53:21
Acknowledged.
zty
2014/07/23 19:53:22
Acknowledged.
|
| + '--test-type', |
| + suite, |
| + '--run-python-script' |
| + ] + property_args |
|
jbudorick
2014/07/23 14:23:12
style: this should be indented
|
| + if options.factory_properties.get('generate_gtest_json'): |
| + args.append('--generate-json-file') |
| + |
| + if options.target == 'Release': |
| + args += ['--target', 'Release'] |
| + args += cmd |
| + RunCmd(args) |
| + |
| + |
| def RunTestSuites(options, suites, suites_options=None): |
| """Manages an invocation of test_runner.py for gtests. |
| @@ -125,7 +149,7 @@ def RunTestSuites(options, suites, suites_options=None): |
| cmd += suites_options.get(suite, []) |
| if suite == 'content_browsertests': |
| cmd.append('--num_retries=1') |
| - RunCmd(cmd) |
| + _RunTest(options, cmd, suite) |
| def RunChromeDriverTests(options): |