Commit 12468a96 authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot

[Fuchsia] enable viz_unittests on Fuchsia bots

viz_unittests now pass on Fuchsia (with headless ozone platform), so
they can be enabled on the bots.

Also added --child-arg argument in the test runner, which makes it
easier to pass custom arguments to the test binary.

Bug: 961455
Change-Id: I923af4978658b57d4da00a68fab8fdb3449ff47d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1725157
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Auto-Submit: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682184}
parent 79b4955b
...@@ -62,12 +62,14 @@ def main(): ...@@ -62,12 +62,14 @@ def main():
parser.add_argument('--enable-test-server', action='store_true', parser.add_argument('--enable-test-server', action='store_true',
default=False, default=False,
help='Enable Chrome test server spawner.') help='Enable Chrome test server spawner.')
parser.add_argument('child_args', nargs='*',
help='Arguments for the test process.')
parser.add_argument('--test-launcher-bot-mode', action='store_true', parser.add_argument('--test-launcher-bot-mode', action='store_true',
default=False, default=False,
help='Informs the TestLauncher to that it should enable ' help='Informs the TestLauncher to that it should enable '
'special allowances for running on a test bot.') 'special allowances for running on a test bot.')
parser.add_argument('--child-arg', action='append',
help='Arguments for the test process.')
parser.add_argument('child_args', nargs='*',
help='Arguments for the test process.')
args = parser.parse_args() args = parser.parse_args()
ConfigureLogging(args) ConfigureLogging(args)
...@@ -94,12 +96,14 @@ def main(): ...@@ -94,12 +96,14 @@ def main():
'--test-launcher-retry-limit=' + args.test_launcher_retry_limit) '--test-launcher-retry-limit=' + args.test_launcher_retry_limit)
if args.gtest_break_on_failure: if args.gtest_break_on_failure:
child_args.append('--gtest_break_on_failure') child_args.append('--gtest_break_on_failure')
if args.child_args:
child_args.extend(args.child_args)
if args.test_launcher_summary_output: if args.test_launcher_summary_output:
child_args.append('--test-launcher-summary-output=' + TEST_RESULT_PATH) child_args.append('--test-launcher-summary-output=' + TEST_RESULT_PATH)
if args.child_arg:
child_args.extend(args.child_arg)
if args.child_args:
child_args.extend(args.child_args)
with GetDeploymentTargetForArgs(args) as target: with GetDeploymentTargetForArgs(args) as target:
target.Start() target.Start()
......
...@@ -7010,6 +7010,25 @@ ...@@ -7010,6 +7010,25 @@
}, },
"test": "ui_base_unittests" "test": "ui_base_unittests"
}, },
{
"args": [
"--child-arg=--ozone-platform=headless"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"cpu": "arm64",
"os": "Ubuntu-16.04"
}
]
},
"test": "viz_unittests"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -7493,6 +7512,25 @@ ...@@ -7493,6 +7512,25 @@
}, },
"test": "ui_base_unittests" "test": "ui_base_unittests"
}, },
{
"args": [
"--child-arg=--ozone-platform=headless"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04"
}
]
},
"test": "viz_unittests"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -7995,6 +8033,25 @@ ...@@ -7995,6 +8033,25 @@
}, },
"test": "ui_base_unittests" "test": "ui_base_unittests"
}, },
{
"args": [
"--child-arg=--ozone-platform=headless"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"kvm": "1",
"os": "Ubuntu-16.04"
}
]
},
"test": "viz_unittests"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
......
...@@ -1603,6 +1603,8 @@ ...@@ -1603,6 +1603,8 @@
'remove_from': [ 'remove_from': [
# chromium.win # chromium.win
'Win10 Tests x64', 'Win10 Tests x64',
# chromium.linux
'Fuchsia x64', # https://crbug.com/961455
], ],
}, },
'vr_pixeltests': { 'vr_pixeltests': {
......
...@@ -2776,6 +2776,11 @@ ...@@ -2776,6 +2776,11 @@
'--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter', '--test-launcher-filter-file=../../testing/buildbot/filters/fuchsia.ui_base_unittests.filter',
], ],
}, },
'viz_unittests': {
'args': [
'--child-arg=--ozone-platform=headless',
],
},
'web_engine_browsertests': {}, 'web_engine_browsertests': {},
'web_engine_integration_tests': {}, 'web_engine_integration_tests': {},
'web_engine_unittests': {}, 'web_engine_unittests': {},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment