Tweak which tests run on ToTLinuxUBSanVptr and UBSanVptr Linux.

https://chromium-review.googlesource.com/c/chromium/src/+/933862 added
chromium_linux_clang_and_gl_gtests to the UBSanVptr Linux bot, while
the ToT bot only runs chromium_linux_clang_gtests -- and gl_unittests
doesn't run under ubsan yet (see blockers of crbug.com/815183). So
switch UBSanVptr Linux to chromium_linux_clang_gtests instead.

Many of the tests that were run on UBSanVptr Linux do pass, so run
those on ToTLinuxUBSanVptr too. Namely, aura_unittests, capture_unittests,
chromedriver_unittests, components_browsertests, compositor_unittests,
dbus_unittests, events_unittests, gin_unittests, media_unittests,
mojo_common_unittests, mojo_unittests, nacl_loader_unittests,
ui_touch_selection_unittests, and wm_unittests now run on the ToT bot.

Generally check that if a test is disabled on ToTLinuxUBSanVptr
it's disabled for UBSanVptr Linux too (notably, interactive_ui_tests
no longer runs on the non-tot bot, which also doesn't pass. But
services_unittests now does run, like on the tot bot).

Bug: 814099, 815183
Change-Id: Icef0bd597f740774351a112df1d2c891ee371d24
Reviewed-on: https://chromium-review.googlesource.com/934424Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538947}

testing/buildbot/chromium.clang.json

@@ -6516,6 +6516,12 @@
         },
         "test": "angle_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "aura_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -6540,6 +6546,12 @@
         },
         "test": "cacheinvalidation_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "capture_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -6552,6 +6564,24 @@
         },
         "test": "cc_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "chromedriver_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "components_browsertests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "compositor_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -6571,6 +6601,12 @@
         },
         "test": "crypto_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "dbus_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -6583,6 +6619,12 @@
         },
         "test": "display_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "events_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -6607,6 +6649,12 @@
         },
         "test": "gfx_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "gin_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -6643,12 +6691,36 @@
         },
         "test": "media_blink_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "media_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "midi_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "mojo_common_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "mojo_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "nacl_loader_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -6715,6 +6787,12 @@
         },
         "test": "ui_base_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "ui_touch_selection_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -6739,6 +6817,12 @@
         },
         "test": "webkit_unit_tests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "wm_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -10601,12 +10685,6 @@
         },
         "test": "gin_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "gl_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -10631,12 +10709,6 @@
         },
         "test": "gpu_unittests"
       },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "interactive_ui_tests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -10727,6 +10799,12 @@
         },
         "test": "sandbox_linux_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "services_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/test_suite_exceptions.pyl

@@ -134,7 +134,6 @@
       'CrWinClngLLD64dbg',
       'CrWinClngLLDdbg',
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       'ToTWin',
       'ToTWin(dbg)',
       'ToTWin(dll)',
@@ -465,10 +464,6 @@
     ],
   },
   'capture_unittests': {
-    'remove_from': [
-      # chromium.clang
-      'ToTLinuxUBSanVptr',
-    ],
     'modifications': {
       'KitKat Tablet Tester': {
         'swarming': {
@@ -844,7 +839,6 @@
       'linux-chromeos-rel',
       # chromium.clang
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       # chromium.memory
       'Linux ASan LSan Tests (1)',
       'Linux Chromium OS ASan LSan Tests (1)',
@@ -873,7 +867,6 @@
       'ToTLinux',
       'ToTLinuxASan',
       'ToTLinuxMSan',
-      'ToTLinuxUBSanVptr',
       'ToTMac',
       'ToTMacASan',
       # chromium.fyi
@@ -1013,7 +1006,6 @@
       'CrWinClngLLD64dbg',
       'CrWinClngLLDdbg',
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       'ToTWin',
       'ToTWin(dbg)',
       'ToTWin(dll)',
@@ -1447,7 +1439,6 @@
     'remove_from': [
       # chromium.clang
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       # chromium.linux
       'Linux Tests (dbg)(1)(32)',
       # chromium.memory
@@ -1538,7 +1529,6 @@
     'remove_from': [
       # chromium.clang
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       # chromium.memory
       'Linux ASan LSan Tests (1)',
     ],
@@ -1646,7 +1636,6 @@
       'ToTLinux',
       'ToTLinuxASan',
       'ToTLinuxMSan',
-      'ToTLinuxUBSanVptr',
       # chromium.fyi
       'Chromium Mac 10.10 MacViews',
       'Chromium Mac 10.11',
@@ -1681,6 +1670,7 @@
       'CFI Linux (icall)',
       'CFI Linux ToT',
       'ToTLinuxThinLTO',
+      'ToTLinuxUBSanVptr',
       'UBSanVptr Linux',
       # chromium.fyi
       'Out of Process Profiling Linux',
@@ -1911,6 +1901,7 @@
     'remove_from': [
       # chromium.clang
       'ToTLinuxUBSanVptr',
+      'UBSanVptr Linux',
       # chromium.fyi
       'Chromium Win 10 GCE Tests',
       # chromium.memory
@@ -2219,8 +2210,6 @@
   },
   'media_unittests': {
     'remove_from': [
-      # chromium.clang
-      'ToTLinuxUBSanVptr',
       # chromium.linux
       'Fuchsia x64',
       # chromium.fyi
@@ -2322,7 +2311,6 @@
       'linux-chromeos-rel',
       # chromium.clang
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       # chromium.linux
       'Cast Audio Linux',
       'Cast Linux',
@@ -2372,7 +2360,6 @@
       'linux-chromeos-rel',
       # chromium.clang
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       # chromium.linux
       'Cast Audio Linux',
       'Cast Linux',
@@ -2457,7 +2444,6 @@
     'remove_from': [
       # chromium.clang
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       # chromium.fyi
       'Chromium Mac 10.10 MacViews',
       'Chromium Mac 10.11',
@@ -2890,7 +2876,6 @@
       'ToTAndroidASan',
       'ToTLinuxMSan',
       'ToTLinuxThinLTO',
-      'UBSanVptr Linux',
       # chromium.fyi
       'Chromium Mac 10.10 MacViews',
       'Chromium Mac 10.11',
@@ -3376,7 +3361,6 @@
     'remove_from': [
       # chromium.clang
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       # chromium.memory
       'Linux ASan LSan Tests (1)',
       'Linux ChromiumOS MSan Tests',
@@ -4052,7 +4036,6 @@
       'CrWinClngLLD64dbg',
       'CrWinClngLLDdbg',
       'ToTLinuxASan',
-      'ToTLinuxUBSanVptr',
       'ToTWin',
       'ToTWin(dbg)',
       'ToTWin(dll)',

testing/buildbot/waterfalls.pyl

@@ -735,6 +735,8 @@
           'all',
         ],
         'test_suites': {
+          # no "_and_gl":gl_unittests doesn't pass yet,
+          # crbug.com/https://crbug.com/815183
           'gtest_tests': 'chromium_linux_clang_gtests',
         },
       },
@@ -813,7 +815,9 @@
       },
       'UBSanVptr Linux': {
         'test_suites': {
-          'gtest_tests': 'chromium_linux_clang_and_gl_gtests',
+          # no "_and_gl":gl_unittests doesn't pass yet,
+          # crbug.com/https://crbug.com/815183
+          'gtest_tests': 'chromium_linux_clang_gtests',
         },
       },
     },