2 files changed, 152 insertions, 48 deletions
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 67ac6d9..83c0c7e 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -123,38 +123,16 @@
       "browser_tests",
       "content_browsertests",
       "content_unittests",
-      "events_unittests",
       "extensions_browsertests",
       "extensions_unittests",
-      "gcm_unit_tests",
-      "gfx_unittests",
-      "gn_unittests",
-      "google_apis_unittests",
-      "gpu_unittests",
       "html_viewer_unittests",
       "interactive_ui_tests",
-      "ipc_mojo_unittests",
-      "ipc_tests",
-      "jingle_unittests",
       "mandoline:all",
       "media_unittests",
-      "nacl_loader_unittests",
       "net_unittests",
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sandbox_linux_unittests",
-      "skia_unittests",
-      "sql_unittests",
       "sync_integration_tests",
-      "sync_unit_tests",
-      "ui_base_unittests",
-      "ui_touch_selection_unittests",
       "unit_tests",
-      "url_unittests",
-      "view_manager_service_unittests",
-      "views_unittests",
-      "wm_unittests"
+      "view_manager_service_unittests"
     ],
     "gtest_tests": [
       {
@@ -188,6 +166,9 @@
         "test": "components_unittests"
       },
       {
+        "test": "content_unittests"
+      },
+      {
         "test": "crypto_unittests"
       },
       {
@@ -198,6 +179,78 @@
       },
       {
         "test": "display_unittests"
+      },
+      {
+        "test": "events_unittests"
+      },
+      {
+        "test": "extensions_unittests"
+      },
+      {
+        "test": "extensions_unittests"
+      },
+      {
+        "test": "gcm_unit_tests"
+      },
+      {
+        "test": "gfx_unittests"
+      },
+      {
+        "test": "gn_unittests"
+      },
+      {
+        "test": "google_apis_unittests"
+      },
+      {
+        "test": "gpu_unittests"
+      },
+      {
+        "test": "ipc_mojo_unittests"
+      },
+      {
+        "test": "ipc_tests"
+      },
+      {
+        "test": "jingle_unittests"
+      },
+      {
+        "test": "nacl_loader_unittests"
+      },
+      {
+        "test": "ppapi_unittests"
+      },
+      {
+        "test": "printing_unittests"
+      },
+      {
+        "test": "remoting_unittests"
+      },
+      {
+        "test": "sandbox_linux_unittests"
+      },
+      {
+        "test": "skia_unittests"
+      },
+      {
+        "test": "sql_unittests"
+      },
+      {
+        "test": "sync_unit_tests"
+      },
+      {
+        "test": "ui_base_unittests"
+      },
+      {
+        "test": "ui_touch_selection_unittests"
+      },
+      {
+        "test": "url_unittests"
+      },
+      {
+        "test": "views_unittests"
+      },
+      {
+        "test": "wm_unittests"
       }
     ]
   },
diff --git a/testing/buildbot/tryserver.chromium.linux.json b/testing/buildbot/tryserver.chromium.linux.json
index 3425f9c..d2edb08 100644
--- a/testing/buildbot/tryserver.chromium.linux.json
+++ b/testing/buildbot/tryserver.chromium.linux.json
@@ -172,39 +172,15 @@
     "additional_compile_targets": [
       "browser_tests",
       "content_browsertests",
-      "content_unittests",
-      "events_unittests",
       "extensions_browsertests",
-      "extensions_unittests",
-      "gcm_unit_tests",
-      "gfx_unittests",
-      "gn_unittests",
-      "google_apis_unittests",
-      "gpu_unittests",
       "html_viewer_unittests",
       "interactive_ui_tests",
-      "ipc_mojo_unittests",
-      "ipc_tests",
-      "jingle_unittests",
       "mandoline:all",
       "media_unittests",
-      "nacl_loader_unittests",
       "net_unittests",
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sandbox_linux_unittests",
-      "skia_unittests",
-      "sql_unittests",
       "sync_integration_tests",
-      "sync_unit_tests",
-      "ui_base_unittests",
-      "ui_touch_selection_unittests",
       "unit_tests",
-      "url_unittests",
-      "view_manager_service_unittests",
-      "views_unittests",
-      "wm_unittests"
+      "view_manager_service_unittests"
     ],
     "gtest_tests": [
       {
@@ -238,6 +214,9 @@
         "test": "components_unittests"
       },
       {
+        "test": "content_unittests"
+      },
+      {
         "test": "crypto_unittests"
       },
       {
@@ -248,6 +227,78 @@
       },
       {
         "test": "display_unittests"
+      },
+      {
+        "test": "events_unittests"
+      },
+      {
+        "test": "extensions_unittests"
+      },
+      {
+        "test": "extensions_unittests"
+      },
+      {
+        "test": "gcm_unit_tests"
+      },
+      {
+        "test": "gfx_unittests"
+      },
+      {
+        "test": "gn_unittests"
+      },
+      {
+        "test": "google_apis_unittests"
+      },
+      {
+        "test": "gpu_unittests"
+      },
+      {
+        "test": "ipc_mojo_unittests"
+      },
+      {
+        "test": "ipc_tests"
+      },
+      {
+        "test": "jingle_unittests"
+      },
+      {
+        "test": "nacl_loader_unittests"
+      },
+      {
+        "test": "ppapi_unittests"
+      },
+      {
+        "test": "printing_unittests"
+      },
+      {
+        "test": "remoting_unittests"
+      },
+      {
+        "test": "sandbox_linux_unittests"
+      },
+      {
+        "test": "skia_unittests"
+      },
+      {
+        "test": "sql_unittests"
+      },
+      {
+        "test": "sync_unit_tests"
+      },
+      {
+        "test": "ui_base_unittests"
+      },
+      {
+        "test": "ui_touch_selection_unittests"
+      },
+      {
+        "test": "url_unittests"
+      },
+      {
+        "test": "views_unittests"
+      },
+      {
+        "test": "wm_unittests"
       }
     ]
   }