Commit 6ef585df authored by Nico Weber's avatar Nico Weber

Remove chromium_mac_fyi_gtests suite, run regular chromium_mac_gtests suite on the mac FYI bots.

This makes the fyi bots run viz_gtests instead of viz_fyi_gtests which removes
a few test binaries, but since those weren't run on any other desktop bot,
it probably wasn't intentional that they run on mac anyways.

Bug: 843511
Change-Id: Ieb132304f3e6b3869c1c2238ec509ed5a95174ab
Reviewed-on: https://chromium-review.googlesource.com/1108360Reviewed-by: default avatarJonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569400}
parent 70148c9c
...@@ -421,17 +421,6 @@ ...@@ -421,17 +421,6 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-surface-synchronization"
],
"name": "surface_sync_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -546,16 +535,6 @@ ...@@ -546,16 +535,6 @@
}, },
"test": "interactive_ui_tests" "test": "interactive_ui_tests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "interactive_ui_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -3529,17 +3508,6 @@ ...@@ -3529,17 +3508,6 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-surface-synchronization"
],
"name": "surface_sync_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor", "--enable-features=VizDisplayCompositor",
...@@ -3654,16 +3622,6 @@ ...@@ -3654,16 +3622,6 @@
}, },
"test": "interactive_ui_tests" "test": "interactive_ui_tests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "interactive_ui_tests"
},
{ {
"swarming": { "swarming": {
"can_use_on_swarming_builders": true "can_use_on_swarming_builders": true
...@@ -7212,18 +7170,6 @@ ...@@ -7212,18 +7170,6 @@
}, },
"test": "content_browsertests" "test": "content_browsertests"
}, },
{
"args": [
"--enable-surface-synchronization",
"--enable-features=ViewsBrowserWindows"
],
"name": "surface_sync_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 2
},
"test": "content_browsertests"
},
{ {
"args": [ "args": [
"--enable-features=VizDisplayCompositor,ViewsBrowserWindows", "--enable-features=VizDisplayCompositor,ViewsBrowserWindows",
...@@ -7383,16 +7329,6 @@ ...@@ -7383,16 +7329,6 @@
}, },
"test": "interactive_ui_tests" "test": "interactive_ui_tests"
}, },
{
"args": [
"--enable-features=VizDisplayCompositor,ViewsBrowserWindows"
],
"name": "viz_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "interactive_ui_tests"
},
{ {
"args": [ "args": [
"--enable-features=ViewsBrowserWindows" "--enable-features=ViewsBrowserWindows"
......
...@@ -2481,16 +2481,6 @@ ...@@ -2481,16 +2481,6 @@
'telemetry_perf_unittests_isolated_scripts', 'telemetry_perf_unittests_isolated_scripts',
], ],
'chromium_mac_fyi_gtests': [
'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output',
'mac_specific_chromium_gtests',
'non_android_chromium_gtests',
'non_android_and_cast_and_chromeos_chromium_gtests',
'non_linux_chromium_gtests',
'viz_fyi_gtests',
],
'chromium_mac_gtests': [ 'chromium_mac_gtests': [
'chromium_gtests', 'chromium_gtests',
'chromium_gtests_for_devices_with_graphical_output', 'chromium_gtests_for_devices_with_graphical_output',
......
...@@ -2042,7 +2042,7 @@ ...@@ -2042,7 +2042,7 @@
}, },
'Chromium Mac 10.13': { 'Chromium Mac 10.13': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_mac_fyi_gtests', 'gtest_tests': 'chromium_mac_gtests',
'isolated_scripts': 'chromium_rel_isolated_scripts', 'isolated_scripts': 'chromium_rel_isolated_scripts',
}, },
}, },
...@@ -2369,7 +2369,7 @@ ...@@ -2369,7 +2369,7 @@
}, },
'mac-views-rel': { 'mac-views-rel': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_mac_fyi_gtests', 'gtest_tests': 'chromium_mac_gtests',
}, },
'args': [ 'args': [
'--enable-features=ViewsBrowserWindows', '--enable-features=ViewsBrowserWindows',
...@@ -2441,7 +2441,7 @@ ...@@ -2441,7 +2441,7 @@
}, },
'Out of Process Profiling Mac': { 'Out of Process Profiling Mac': {
'test_suites': { 'test_suites': {
'gtest_tests': 'chromium_mac_fyi_gtests', 'gtest_tests': 'chromium_mac_gtests',
'isolated_scripts': 'chromium_rel_isolated_scripts', 'isolated_scripts': 'chromium_rel_isolated_scripts',
}, },
}, },
......
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