linux: Let clang tot bots use the same test list as the main waterfall bots.

This ensures that the memory and clang tot bots run the same tests as the
main waterfall bots.

Everything running on the main waterfall must be tested with clang/tot too
to make sure compiler updates don't break anything. This change makes it
impossible for things to get out of sync (on linux).

No behavior change, the chromium_linux_gtests and chromium_linux_clang_gtests
were identical already.

Also rename chromium_linux_clang_and_gl_gtests to chromium_linux_and_gl_gtests
and add a comment for it.

Bug: 843511
Change-Id: Idf95d837cdae5247d2011c85f2c19961d29bd195
Reviewed-on: https://chromium-review.googlesource.com/1093062Reviewed-by: Hans Wennborg <hans@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565666}

testing/buildbot/test_suites.pyl

@@ -618,7 +618,7 @@
       }
     },
   },
-  'clang_gl_gtests': {
+  'gl_gtests': {
     'gl_tests': {},
     'gl_unittests': {},
   },
@@ -2402,7 +2402,9 @@
     'linux_flavor_specific_chromium_gtests',
   ],
 
-  'chromium_linux_clang_gtests': [
+  # gl_tests requires dedicated slaves with GPUs on linux, so have a separate
+  # test list with gl_tests included. This is chromium_linux_gtests + gl_gtests.
+  'chromium_linux_and_gl_gtests': [
     'aura_gtests',
     'chromium_gtests',
     'chromium_gtests_for_devices_with_graphical_output',
@@ -2419,26 +2421,7 @@
     'site_isolation_chromium_linux_gtests',
     'viz_gtests',
     'vr_platform_specific_chromium_gtests',
-  ],
-
-  'chromium_linux_clang_and_gl_gtests': [
-    'aura_gtests',
-    'chromium_gtests',
-    'chromium_gtests_for_devices_with_graphical_output',
-    'chromium_gtests_for_linux_and_chromeos_only',
-    'linux_and_mac_specific_chromium_gtests',
-    'clang_gl_gtests',
-    'linux_flavor_specific_chromium_gtests',
-    'linux_specific_chromium_gtests',
-    'network_service_gtests',
-    'non_android_chromium_gtests',
-    'non_android_and_cast_and_chromeos_chromium_gtests',
-    'non_android_and_cast_and_chromeos_and_clang_and_mac_fyi_chromium_gtests',
-    'non_mac_chromium_gtests',
-    'site_isolation_chromium_gtests',
-    'site_isolation_chromium_linux_gtests',
-    'viz_gtests',
-    'vr_platform_specific_chromium_gtests',
+    'gl_gtests',
   ],
 
   'chromium_linux_gtests': [
@@ -2548,7 +2531,7 @@
     'chromium_gtests',
     'chromium_gtests_for_devices_with_graphical_output',
     'chromium_gtests_for_linux_and_chromeos_only',
-    'clang_gl_gtests',
+    'gl_gtests',
     'linux_and_mac_specific_chromium_gtests',
     'linux_flavor_specific_chromium_gtests',
     'linux_specific_chromium_gtests',

testing/buildbot/waterfalls.pyl

@@ -521,12 +521,12 @@
     'machines': {
       'CFI Linux (icall)': {
         'test_suites': {
-          'gtest_tests': 'chromium_linux_clang_and_gl_gtests',
+          'gtest_tests': 'chromium_linux_and_gl_gtests',
         },
       },
       'CFI Linux ToT': {
         'test_suites': {
-          'gtest_tests': 'chromium_linux_clang_and_gl_gtests',
+          'gtest_tests': 'chromium_linux_and_gl_gtests',
         },
       },
       'CrWinAsan': {
@@ -648,7 +648,7 @@
       },
       'ToTLinux': {
         'test_suites': {
-          'gtest_tests': 'chromium_linux_clang_gtests',
+          'gtest_tests': 'chromium_linux_gtests',
           'scripts': 'check_gn_headers_script',
         },
       },
@@ -662,17 +662,17 @@
           'all',
         ],
         'test_suites': {
-          'gtest_tests': 'chromium_linux_clang_gtests',
+          'gtest_tests': 'chromium_linux_gtests',
         },
       },
       'ToTLinuxMSan': {
         'test_suites': {
-          'gtest_tests': 'chromium_linux_clang_gtests',
+          'gtest_tests': 'chromium_linux_gtests',
         },
       },
       'ToTLinuxThinLTO': {
         'test_suites': {
-          'gtest_tests': 'chromium_linux_clang_and_gl_gtests',
+          'gtest_tests': 'chromium_linux_and_gl_gtests',
         },
       },
       'ToTLinuxUBSanVptr': {
@@ -682,7 +682,7 @@
         'test_suites': {
           # no "_and_gl":gl_unittests doesn't pass yet,
           # crbug.com/https://crbug.com/815183
-          'gtest_tests': 'chromium_linux_clang_gtests',
+          'gtest_tests': 'chromium_linux_gtests',
         },
       },
       'ToTMac': {
@@ -762,7 +762,7 @@
         'test_suites': {
           # no "_and_gl":gl_unittests doesn't pass yet,
           # crbug.com/https://crbug.com/815183
-          'gtest_tests': 'chromium_linux_clang_gtests',
+          'gtest_tests': 'chromium_linux_gtests',
         },
       },
     },
@@ -2042,12 +2042,12 @@
       },
       'CFI Linux (icall)': {
         'test_suites': {
-          'gtest_tests': 'chromium_linux_clang_and_gl_gtests',
+          'gtest_tests': 'chromium_linux_and_gl_gtests',
         },
       },
       'CFI Linux ToT': {
         'test_suites': {
-          'gtest_tests': 'chromium_linux_clang_and_gl_gtests',
+          'gtest_tests': 'chromium_linux_and_gl_gtests',
         },
       },
       'Chromium Mac 10.11': {
@@ -2366,9 +2366,7 @@
       },
       'Out of Process Profiling Linux': {
         'test_suites': {
-          # TODO(kbr): it's weird that this has the most in common with the
-          # clang testers' test suites.
-          'gtest_tests': 'chromium_linux_clang_and_gl_gtests',
+          'gtest_tests': 'chromium_linux_and_gl_gtests',
         },
       },
       'Out of Process Profiling Mac': {