Commit 2125f897 authored by Nico Weber's avatar Nico Weber

Use chromium_linux_and_gl_gtests on fewer bots.

"Out of Process Profiling Linux" used chromium_linux_and_gl_gtests and then
removed of the suites added by _and_gl via test_suite_exceptions again.
Instead, just use regular chromium_linux_gtests for it. No behavior change.

"ToTLinuxThinLTO" used the _and_gl version and removed gl_tests again.
It didn't remove gl_unittests, but that one was failing on it. So just
use chromium_linux_gtests here too.

"ToTLinuxUBSanVptr" and "UBSanVptr Linux" were removing gl_tests (but not
gl_unittests) via the exceptions file despite not (yet?) using the _and_gl
test list, so remove these unused exceptions.

Add a comment explaining why interactive_ui_tests doesn't run on the ubsan
bots (probably it should run there, with just the few failing tests disabled).

Bug: 843511,849868
Change-Id: Ifd6397529fce300ef989f3a637f7ec48bd784175
Reviewed-on: https://chromium-review.googlesource.com/1093570Reviewed-by: default avatarPeter Collingbourne <pcc@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565773}
parent 0db6ee12
......@@ -14221,12 +14221,6 @@
},
"test": "gin_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "gl_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......
......@@ -1219,11 +1219,6 @@
# chromium.clang
'CFI Linux (icall)',
'CFI Linux ToT',
'ToTLinuxThinLTO',
'ToTLinuxUBSanVptr',
'UBSanVptr Linux',
# chromium.fyi
'Out of Process Profiling Linux',
# chromium.gpu
# On Android, these are already run on the main waterfall.
# Run them on the one-off Android FYI bots, though.
......@@ -1321,8 +1316,6 @@
},
'gl_unittests': {
'remove_from': [
# chromium.fyi
'Out of Process Profiling Linux',
# chromium.gpu.fyi
# On Android, these are already run on the main waterfall.
# Run them on the one-off Android FYI bots, though.
......@@ -1464,8 +1457,8 @@
'interactive_ui_tests': {
'remove_from': [
# chromium.clang
'ToTLinuxUBSanVptr',
'UBSanVptr Linux',
'ToTLinuxUBSanVptr', # https://crbug.com/815190
'UBSanVptr Linux', # https://crbug.com/815190
# chromium.memory
'Linux TSan Tests',
],
......
......@@ -672,7 +672,7 @@
},
'ToTLinuxThinLTO': {
'test_suites': {
'gtest_tests': 'chromium_linux_and_gl_gtests',
'gtest_tests': 'chromium_linux_gtests',
},
},
'ToTLinuxUBSanVptr': {
......@@ -681,7 +681,7 @@
],
'test_suites': {
# no "_and_gl":gl_unittests doesn't pass yet,
# crbug.com/https://crbug.com/815183
# https://crbug.com/815183
'gtest_tests': 'chromium_linux_gtests',
},
},
......@@ -761,7 +761,7 @@
'UBSanVptr Linux': {
'test_suites': {
# no "_and_gl":gl_unittests doesn't pass yet,
# crbug.com/https://crbug.com/815183
# https://crbug.com/815183
'gtest_tests': 'chromium_linux_gtests',
},
},
......@@ -2338,7 +2338,7 @@
},
'Out of Process Profiling Linux': {
'test_suites': {
'gtest_tests': 'chromium_linux_and_gl_gtests',
'gtest_tests': 'chromium_linux_gtests',
},
},
'Out of Process Profiling Mac': {
......
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