Bring tryserver tests more in sync with main waterfall

BUG=380709, 381023, 369289, 357448
R=machenbach@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275077 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 28 insertions, 30 deletions

diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index 29f0a43..5ce07ac 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -8,12 +8,29 @@
       "exclude_builders": ["tryserver.chromium:win_chromium_x64_rel"]
     },
     "cacheinvalidation_unittests",
+    "cast_unittests",
     "cc_unittests",
     "chromedriver_unittests",
+    {
+      "test": "chrome_elf_unittests",
+      "platforms": ["win"]
+    },
     "components_unittests",
+    {
+      "test": "compositor_unittests",
+      "platforms": ["linux", "win"]
+    },
+    {
+      "test": "courgette_unittests",
+      "platforms": ["win"]
+    },
     "content_browsertests",
     "content_unittests",
     "crypto_unittests",
+    {
+      "test": "dbus_unittests",
+      "platforms": ["linux"]
+    },
     "device_unittests",
     "events_unittests",
     "gcm_unit_tests",
@@ -54,13 +71,19 @@
     "sync_unit_tests",
     "ui_unittests",
     "unit_tests",
+    "url_unittests",
+    "webkit_compositor_bindings_unittests",
+    {
+      "test": "wm_unittests",
+      "platforms": ["linux"]
+    },
     {
       "test": "app_shell_browsertests",
       "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
     },
     {
       "test": "ash_unittests",
-      "chromium_configs": ["chromium_chromeos"]
+      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
     },
     {
       "test": "ash_unittests",
@@ -75,6 +98,10 @@
       "platforms": ["linux", "win"]
     },
     {
+      "test": "views_unittests",
+      "platforms": ["linux", "win"]
+    },
+    {
       "test": "sandbox_linux_unittests",
       "platforms": ["linux"],
       "args": ["--test-launcher-print-test-stdio=always"]
@@ -84,38 +111,9 @@
       "platforms": ["mac"]
     },
     {
-      "test": "views_unittests",
-      "platforms": ["win"]
-    },
-    {
-      "test": "views_unittests",
-      "platforms": ["linux"],
-      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-    },
-    {
       "test": "chromeos_unittests",
       "platforms": ["linux"],
       "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-    },
-    {
-      "test": "ash_unittests",
-      "platforms": ["linux"],
-      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-    },
-    {
-      "test": "dbus_unittests",
-      "platforms": ["linux"],
-      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-    },
-    {
-      "test": "aura_unittests",
-      "platforms": ["linux"],
-      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
-    },
-    {
-      "test": "wm_unittests",
-      "platforms": ["linux"],
-      "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
     }
   ]
 }