Skip to content

GitLab

T
tangled
Commit d45a4356 authored by Robbie McElrath's avatar Robbie McElrath Committed by Commit Bot
Browse files
Options

Remove non_network_service_gtests test suites. 

We don't need these tests now that the Network Service is launched on
stable.

Bug: 920038
Change-Id: I82de992770b8f820321e884b121b7e9ee2904eea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1633191Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664879}
parent 9d90efc8
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 188 deletions
testing/buildbot/chromium.chromiumos.json
View file @ d45a4356
...@@ -877,26 +877,6 @@ ...@@ -877,26 +877,6 @@
}, },
"test": "browser_tests" "test": "browser_tests"
}, },
{
"args": [
"--disable-features=NetworkService"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "non_network_service_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
],
"shards": 21
},
"test": "browser_tests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor" "--enable-features=VizDisplayCompositor"
...@@ -1075,25 +1055,6 @@ ...@@ -1075,25 +1055,6 @@
}, },
"test": "components_browsertests" "test": "components_browsertests"
}, },
{
"args": [
"--disable-features=NetworkService"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "non_network_service_components_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
]
},
"test": "components_browsertests"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -1140,25 +1101,6 @@ ...@@ -1140,25 +1101,6 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--disable-features=NetworkService"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "non_network_service_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
]
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--disable-perfetto", "--disable-perfetto",
...@@ -1338,25 +1280,6 @@ ...@@ -1338,25 +1280,6 @@
}, },
"test": "extensions_browsertests" "test": "extensions_browsertests"
}, },
{
"args": [
"--disable-features=NetworkService"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "non_network_service_extensions_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
]
},
"test": "extensions_browsertests"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
...@@ -1493,26 +1416,6 @@ ...@@ -1493,26 +1416,6 @@
}, },
"test": "interactive_ui_tests" "test": "interactive_ui_tests"
}, },
{
"args": [
"--disable-features=NetworkService"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "non_network_service_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
],
"shards": 3
},
"test": "interactive_ui_tests"
},
{ {
"args": [ "args": [
"--disable-blink-features=HTMLImports,ShadowDOMV0,CustomElementsV0", "--disable-blink-features=HTMLImports,ShadowDOMV0,CustomElementsV0",
...@@ -2047,25 +1950,6 @@ ...@@ -2047,25 +1950,6 @@
}, },
"test": "sync_integration_tests" "test": "sync_integration_tests"
}, },
{
"args": [
"--disable-features=NetworkService"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "non_network_service_sync_integration_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-14.04"
}
]
},
"test": "sync_integration_tests"
},
{ {
"merge": { "merge": {
"args": [], "args": [],
......
testing/buildbot/test_suite_exceptions.pyl
View file @ d45a4356
...@@ -1043,16 +1043,6 @@ ...@@ -1043,16 +1043,6 @@
'ToTAndroidCFI', 'ToTAndroidCFI',
], ],
}, },
'non_network_service_browser_tests': {
'modifications': {
# chromium.chromiumos
'linux-chromeos-dbg': {
'swarming': {
'shards': 21,
},
},
},
},
'non_network_service_webkit_layout_tests' : { 'non_network_service_webkit_layout_tests' : {
'remove_from': [ 'remove_from': [
'Linux Tests (dbg)(1)(32)', # 32-bit linux is unsupported 'Linux Tests (dbg)(1)(32)', # 32-bit linux is unsupported
......
testing/buildbot/test_suites.pyl
View file @ d45a4356
...@@ -4040,51 +4040,6 @@ ...@@ -4040,51 +4040,6 @@
'crashpad_tests': {}, 'crashpad_tests': {},
}, },
'non_network_service_gtests': {
'non_network_service_browser_tests': {
'args': [
'--disable-features=NetworkService',
],
'swarming': {
'shards': 10,
},
'test': 'browser_tests',
},
'non_network_service_components_browsertests': {
'args': [
'--disable-features=NetworkService',
],
'test': 'components_browsertests',
},
'non_network_service_content_browsertests': {
'args': [
'--disable-features=NetworkService',
],
'test': 'content_browsertests',
},
'non_network_service_extensions_browsertests': {
'args': [
'--disable-features=NetworkService',
],
'test': 'extensions_browsertests',
},
'non_network_service_interactive_ui_tests': {
'args': [
'--disable-features=NetworkService'
],
'swarming': {
'shards': 3,
},
'test': 'interactive_ui_tests',
},
'non_network_service_sync_integration_tests': {
'args': [
'--disable-features=NetworkService'
],
'test': 'sync_integration_tests',
},
},
'non_network_service_isolated_scripts': { 'non_network_service_isolated_scripts': {
'non_network_service_webkit_layout_tests': { 'non_network_service_webkit_layout_tests': {
'args': [ 'args': [
...@@ -5180,22 +5135,6 @@ ...@@ -5180,22 +5135,6 @@
'viz_chromeos_gtests', 'viz_chromeos_gtests',
], ],
'linux_chromeos_with_non_network_service_gtests': [
# This is:
# linux_chromeos_gtests
# + non_newtork_service_gtests
'aura_gtests',
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
'chromium_gtests_for_linux_and_chromeos_only',
'chromium_gtests_for_win_and_linux_only',
'linux_chromeos_specific_gtests',
'linux_flavor_specific_chromium_gtests',
'non_android_chromium_gtests',
'non_network_service_gtests',
'viz_chromeos_gtests',
],
'linux_viz_gtests': [ 'linux_viz_gtests': [
'skia_renderer_fyi_gtests', 'skia_renderer_fyi_gtests',
], ],
......
testing/buildbot/waterfalls.pyl
View file @ d45a4356
...@@ -709,7 +709,7 @@ ...@@ -709,7 +709,7 @@
'linux-trusty', 'linux-trusty',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'linux_chromeos_with_non_network_service_gtests', 'gtest_tests': 'linux_chromeos_gtests',
}, },
}, },
'linux-chromeos-rel': { 'linux-chromeos-rel': {
......
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