Commit ad9c3a71 authored by Wez's avatar Wez Committed by Commit Bot

[Fuchsia] Enable web_engine_integration_tests on FYI.

Bug: 971927
Change-Id: I7c3f8c3340bec731fae7cadb9e8a03cc9c2dc0b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1649029
Auto-Submit: Wez <wez@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarFabrice de Gans-Riberi <fdegans@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667207}
parent 2c9d1584
...@@ -4734,6 +4734,16 @@ ...@@ -4734,6 +4734,16 @@
}, },
"test": "web_engine_browsertests" "test": "web_engine_browsertests"
}, },
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "web_engine_integration_tests"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -5189,6 +5199,22 @@ ...@@ -5189,6 +5199,22 @@
}, },
"test": "web_engine_browsertests" "test": "web_engine_browsertests"
}, },
{
"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": "web_engine_integration_tests"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -5675,6 +5701,22 @@ ...@@ -5675,6 +5701,22 @@
}, },
"test": "web_engine_browsertests" "test": "web_engine_browsertests"
}, },
{
"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": "web_engine_integration_tests"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
......
...@@ -2821,6 +2821,10 @@ ...@@ -2821,6 +2821,10 @@
"label": "//fuchsia/engine:web_engine_browsertests", "label": "//fuchsia/engine:web_engine_browsertests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"web_engine_integration_tests": {
"label": "//fuchsia/runners:web_engine_integration_tests",
"type": "console_test_launcher",
},
"web_engine_unittests": { "web_engine_unittests": {
"label": "//fuchsia/engine:web_engine_unittests", "label": "//fuchsia/engine:web_engine_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
......
...@@ -1581,6 +1581,12 @@ ...@@ -1581,6 +1581,12 @@
'linux-chromeos-dbg', # https://crbug.com/859307 'linux-chromeos-dbg', # https://crbug.com/859307
], ],
}, },
'web_engine_integration_tests': {
'remove_from': [
# chromium.linux
'Fuchsia x64', # https://crbug.com/971927
],
},
'webdriver_tests_suite': { 'webdriver_tests_suite': {
'remove_from': [ 'remove_from': [
'Linux Tests', # https://crbug.com/929689, https://crbug.com/936557 'Linux Tests', # https://crbug.com/929689, https://crbug.com/936557
......
...@@ -2686,6 +2686,7 @@ ...@@ -2686,6 +2686,7 @@
], ],
}, },
'web_engine_browsertests': {}, 'web_engine_browsertests': {},
'web_engine_integration_tests': {},
'web_engine_unittests': {}, 'web_engine_unittests': {},
'web_runner_integration_tests': {}, 'web_runner_integration_tests': {},
}, },
......
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