Rebalance Linux slaves by putting browser_tests by itself for debug.

Also reorder the file to make it easier to read. Add extensions_unittests and google_apis_unittests where missing. Remove old GTK section.

BUG=384941
R=sky@chromium.org

Review URL: https://codereview.chromium.org/492823003

Cr-Commit-Position: refs/heads/master@{#290872}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290872 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 215 insertions, 258 deletions

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index bfbcc3d..b7698d5 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -1,258 +1,215 @@
-{
-  "Linux Tests": {
-    "gtest_tests": [
-      "accessibility_unittests",
-      "app_list_unittests",
-      "aura_unittests",
-      "interactive_ui_tests",
-      "base_unittests",
-      "cacheinvalidation_unittests",
-      "cast_unittests",
-      "cc_unittests",
-      "chromedriver_unittests",
-      "components_unittests",
-      "compositor_unittests",
-      "crypto_unittests",
-      "dbus_unittests",
-      "display_unittests",
-      "extensions_unittests",
-      "gcm_unit_tests",
-      "gfx_unittests",
-      "google_apis_unittests",
-      "gpu_unittests",
-      "url_unittests",
-      "jingle_unittests",
-      "content_unittests",
-      "device_unittests",
-      "events_unittests",
-      "media_unittests",
-      "net_unittests",
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sandbox_linux_unittests",
-      "ui_unittests",
-      "ipc_mojo_unittests",
-      "ipc_tests",
-      "sync_integration_tests",
-      "sync_unit_tests",
-      "unit_tests",
-      "views_unittests",
-      "wm_unittests",
-      "sql_unittests",
-      "browser_tests",
-      "content_browsertests",
-      "app_shell_browsertests",
-      "mojo_apps_js_unittests",
-      "mojo_common_unittests",
-      "mojo_js_unittests",
-      "mojo_public_bindings_unittests",
-      "mojo_public_environment_unittests",
-      "mojo_public_system_unittests",
-      "mojo_public_utility_unittests",
-      "mojo_application_manager_unittests",
-      "mojo_shell_tests",
-      "mojo_system_unittests",
-      "mojo_view_manager_unittests",
-      "nacl_loader_unittests"
-    ]
-  },
-  "Linux GTK Tests": {
-    "gtest_tests": [
-      "accessibility_unittests",
-      "interactive_ui_tests",
-      "base_unittests",
-      "cacheinvalidation_unittests",
-      "cast_unittests",
-      "cc_unittests",
-      "chromedriver_unittests",
-      "components_unittests",
-      "crypto_unittests",
-      "dbus_unittests",
-      "gcm_unit_tests",
-      "google_apis_unittests",
-      "gpu_unittests",
-      "url_unittests",
-      "jingle_unittests",
-      "content_unittests",
-      "device_unittests",
-      "media_unittests",
-      "net_unittests",
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sandbox_linux_unittests",
-      "ui_unittests",
-      "ipc_mojo_unittests",
-      "ipc_tests",
-      "sync_unit_tests",
-      "unit_tests",
-      "sql_unittests",
-      "browser_tests",
-      "content_browsertests",
-      "mojo_apps_js_unittests",
-      "mojo_common_unittests",
-      "mojo_js_unittests",
-      "mojo_public_bindings_unittests",
-      "mojo_public_environment_unittests",
-      "mojo_public_system_unittests",
-      "mojo_public_utility_unittests",
-      "mojo_application_manager_unittests",
-      "mojo_shell_tests",
-      "mojo_system_unittests",
-      "nacl_loader_unittests"
-    ]
-  },
-  "Linux Tests (dbg)(1)(32)": {
-    "gtest_tests": [
-      "net_unittests",
-      "browser_tests",
-      "content_browsertests",
-      "app_shell_browsertests"
-    ]
-  },
-  "Linux Tests (dbg)(2)(32)": {
-    "gtest_tests": [
-      "accessibility_unittests",
-      "app_list_unittests",
-      "aura_unittests",
-      "interactive_ui_tests",
-      "base_unittests",
-      "cacheinvalidation_unittests",
-      "cast_unittests",
-      "cc_unittests",
-      "chromedriver_unittests",
-      "components_unittests",
-      "compositor_unittests",
-      "crypto_unittests",
-      "dbus_unittests",
-      "display_unittests",
-      "gcm_unit_tests",
-      "gfx_unittests",
-      "gpu_unittests",
-      "url_unittests",
-      "jingle_unittests",
-      "content_unittests",
-      "device_unittests",
-      "events_unittests",
-      "media_unittests",
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sandbox_linux_unittests",
-      "ui_unittests",
-      "ipc_mojo_unittests",
-      "ipc_tests",
-      "sync_integration_tests",
-      "sync_unit_tests",
-      "unit_tests",
-      "views_unittests",
-      "wm_unittests",
-      "sql_unittests",
-      "mojo_apps_js_unittests",
-      "mojo_common_unittests",
-      "mojo_js_unittests",
-      "mojo_public_bindings_unittests",
-      "mojo_public_environment_unittests",
-      "mojo_public_system_unittests",
-      "mojo_public_utility_unittests",
-      "mojo_application_manager_unittests",
-      "mojo_shell_tests",
-      "mojo_system_unittests",
-      "mojo_view_manager_unittests",
-      "nacl_loader_unittests"
-    ]
-  },
-  "Linux Tests (dbg)(1)": {
-    "gtest_tests": [
-      "net_unittests",
-      "browser_tests",
-      "content_browsertests",
-      "app_shell_browsertests"
-    ]
-  },
-  "Linux Tests (dbg)(2)": {
-    "gtest_tests": [
-      "accessibility_unittests",
-      "app_list_unittests",
-      "aura_unittests",
-      "interactive_ui_tests",
-      "base_unittests",
-      "cacheinvalidation_unittests",
-      "cast_unittests",
-      "cc_unittests",
-      "chromedriver_unittests",
-      "components_unittests",
-      "compositor_unittests",
-      "crypto_unittests",
-      "dbus_unittests",
-      "display_unittests",
-      "gcm_unit_tests",
-      "gfx_unittests",
-      "google_apis_unittests",
-      "gpu_unittests",
-      "url_unittests",
-      "jingle_unittests",
-      "content_unittests",
-      "device_unittests",
-      "events_unittests",
-      "media_unittests",
-      "ppapi_unittests",
-      "printing_unittests",
-      "remoting_unittests",
-      "sandbox_linux_unittests",
-      "ui_unittests",
-      "ipc_mojo_unittests",
-      "ipc_tests",
-      "sync_integration_tests",
-      "sync_unit_tests",
-      "unit_tests",
-      "views_unittests",
-      "wm_unittests",
-      "sql_unittests",
-      "mojo_apps_js_unittests",
-      "mojo_common_unittests",
-      "mojo_js_unittests",
-      "mojo_public_bindings_unittests",
-      "mojo_public_environment_unittests",
-      "mojo_public_system_unittests",
-      "mojo_public_utility_unittests",
-      "mojo_application_manager_unittests",
-      "mojo_shell_tests",
-      "mojo_system_unittests",
-      "mojo_view_manager_unittests",
-      "nacl_loader_unittests"
-    ]
-  },
-  "Linux Clang (dbg)": {
-    "gtest_tests": [
-      "accessibility_unittests",
-      "base_unittests",
-      "components_unittests",
-      "crypto_unittests",
-      "google_apis_unittests",
-      "content_unittests",
-      "device_unittests",
-      "display_unittests",
-      "sandbox_linux_unittests",
-      "ui_unittests",
-      "ipc_mojo_unittests",
-      "ipc_tests",
-      "sync_unit_tests",
-      "unit_tests",
-      "sql_unittests",
-      "mojo_apps_js_unittests",
-      "mojo_common_unittests",
-      "mojo_js_unittests",
-      "mojo_public_bindings_unittests",
-      "mojo_public_environment_unittests",
-      "mojo_public_system_unittests",
-      "mojo_public_utility_unittests",
-      "mojo_application_manager_unittests",
-      "mojo_shell_tests",
-      "mojo_system_unittests",
-      "mojo_view_manager_unittests",
-      "nacl_loader_unittests"
-    ]
-  }
-}
+{

+  "Linux Tests": {

+    "gtest_tests": [

+      "accessibility_unittests",

+      "app_list_unittests",

+      "app_shell_browsertests",

+      "aura_unittests",

+      "base_unittests",

+      "browser_tests",

+      "cacheinvalidation_unittests",

+      "cast_unittests",

+      "cc_unittests",

+      "chromedriver_unittests",

+      "components_unittests",

+      "compositor_unittests",

+      "content_browsertests",

+      "content_unittests",

+      "crypto_unittests",

+      "dbus_unittests",

+      "device_unittests",

+      "display_unittests",

+      "events_unittests",

+      "extensions_unittests",

+      "gcm_unit_tests",

+      "gfx_unittests",

+      "google_apis_unittests",

+      "gpu_unittests",

+      "interactive_ui_tests",

+      "ipc_mojo_unittests",

+      "ipc_tests",

+      "jingle_unittests",

+      "media_unittests",

+      "mojo_application_manager_unittests",

+      "mojo_apps_js_unittests",

+      "mojo_common_unittests",

+      "mojo_js_unittests",

+      "mojo_public_bindings_unittests",

+      "mojo_public_environment_unittests",

+      "mojo_public_system_unittests",

+      "mojo_public_utility_unittests",

+      "mojo_shell_tests",

+      "mojo_system_unittests",

+      "mojo_view_manager_unittests",

+      "nacl_loader_unittests",

+      "net_unittests",

+      "ppapi_unittests",

+      "printing_unittests",

+      "remoting_unittests",

+      "sandbox_linux_unittests",

+      "sql_unittests",

+      "ui_unittests",

+      "sync_integration_tests",

+      "sync_unit_tests",

+      "unit_tests",

+      "url_unittests",

+      "views_unittests",

+      "wm_unittests"

+    ]

+  },

+  "Linux Tests (dbg)(1)(32)": {

+    "gtest_tests": [

+      "browser_tests"

+    ]

+  },

+  "Linux Tests (dbg)(2)(32)": {

+    "gtest_tests": [

+      "accessibility_unittests",

+      "app_list_unittests",

+      "app_shell_browsertests",

+      "aura_unittests",

+      "base_unittests",

+      "cacheinvalidation_unittests",

+      "cast_unittests",

+      "cc_unittests",

+      "chromedriver_unittests",

+      "components_unittests",

+      "compositor_unittests",

+      "content_browsertests",

+      "content_unittests",

+      "crypto_unittests",

+      "dbus_unittests",

+      "device_unittests",

+      "display_unittests",

+      "events_unittests",

+      "extensions_unittests",

+      "gcm_unit_tests",

+      "gfx_unittests",

+      "google_apis_unittests",

+      "gpu_unittests",

+      "interactive_ui_tests",

+      "ipc_mojo_unittests",

+      "ipc_tests",

+      "jingle_unittests",

+      "media_unittests",

+      "mojo_application_manager_unittests",

+      "mojo_apps_js_unittests",

+      "mojo_common_unittests",

+      "mojo_js_unittests",

+      "mojo_public_bindings_unittests",

+      "mojo_public_environment_unittests",

+      "mojo_public_system_unittests",

+      "mojo_public_utility_unittests",

+      "mojo_shell_tests",

+      "mojo_system_unittests",

+      "mojo_view_manager_unittests",

+      "nacl_loader_unittests",

+      "net_unittests",

+      "ppapi_unittests",

+      "printing_unittests",

+      "remoting_unittests",

+      "sandbox_linux_unittests",

+      "sql_unittests",

+      "ui_unittests",

+      "sync_integration_tests",

+      "sync_unit_tests",

+      "unit_tests",

+      "url_unittests",

+      "views_unittests",

+      "wm_unittests"

+    ]

+  },

+  "Linux Tests (dbg)(1)": {

+    "gtest_tests": [

+      "browser_tests"

+    ]

+  },

+  "Linux Tests (dbg)(2)": {

+    "gtest_tests": [

+      "accessibility_unittests",

+      "app_list_unittests",

+      "app_shell_browsertests",

+      "aura_unittests",

+      "base_unittests",

+      "cacheinvalidation_unittests",

+      "cast_unittests",

+      "cc_unittests",

+      "chromedriver_unittests",

+      "components_unittests",

+      "compositor_unittests",

+      "content_browsertests",

+      "content_unittests",

+      "crypto_unittests",

+      "dbus_unittests",

+      "device_unittests",

+      "display_unittests",

+      "events_unittests",

+      "extensions_unittests",

+      "gcm_unit_tests",

+      "gfx_unittests",

+      "google_apis_unittests",

+      "gpu_unittests",

+      "interactive_ui_tests",

+      "ipc_mojo_unittests",

+      "ipc_tests",

+      "jingle_unittests",

+      "media_unittests",

+      "mojo_application_manager_unittests",

+      "mojo_apps_js_unittests",

+      "mojo_common_unittests",

+      "mojo_js_unittests",

+      "mojo_public_bindings_unittests",

+      "mojo_public_environment_unittests",

+      "mojo_public_system_unittests",

+      "mojo_public_utility_unittests",

+      "mojo_shell_tests",

+      "mojo_system_unittests",

+      "mojo_view_manager_unittests",

+      "nacl_loader_unittests",

+      "net_unittests",

+      "ppapi_unittests",

+      "printing_unittests",

+      "remoting_unittests",

+      "sandbox_linux_unittests",

+      "sql_unittests",

+      "ui_unittests",

+      "sync_integration_tests",

+      "sync_unit_tests",

+      "unit_tests",

+      "url_unittests",

+      "views_unittests",

+      "wm_unittests"

+    ]

+  },

+  "Linux Clang (dbg)": {

+    "gtest_tests": [

+      "accessibility_unittests",

+      "base_unittests",

+      "components_unittests",

+      "content_unittests",

+      "crypto_unittests",

+      "device_unittests",

+      "display_unittests",

+      "google_apis_unittests",

+      "ipc_mojo_unittests",

+      "ipc_tests",

+      "mojo_application_manager_unittests",

+      "mojo_apps_js_unittests",

+      "mojo_common_unittests",

+      "mojo_js_unittests",

+      "mojo_public_bindings_unittests",

+      "mojo_public_environment_unittests",

+      "mojo_public_system_unittests",

+      "mojo_public_utility_unittests",

+      "mojo_shell_tests",

+      "mojo_system_unittests",

+      "mojo_view_manager_unittests",

+      "nacl_loader_unittests",

+      "sandbox_linux_unittests",

+      "sql_unittests",

+      "sync_unit_tests",

+      "ui_unittests",

+      "unit_tests"

+    ]

+  }

+}