Enable mojo unittests on chromium_trybot and waterfall bots.

BUG=346766
TEST=the tests should succeed, including on Mac.
R=phajdan.jr@chromium.org, viettrungluu@chromium.org

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

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

3 files changed, 86 insertions, 6 deletions

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 096c97d..711c3da 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -35,7 +35,15 @@
       "sql_unittests",
       "browser_tests",
       "content_browsertests",
-      "webkit_compositor_bindings_unittests"
+      "webkit_compositor_bindings_unittests",
+      "mojo_common_unittests",
+      "mojo_js_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_service_manager_unittests",
+      "mojo_system_unittests"
     ]
   },
   "Linux GTK Tests": {
@@ -68,7 +76,15 @@
       "sql_unittests",
       "browser_tests",
       "content_browsertests",
-      "webkit_compositor_bindings_unittests"
+      "webkit_compositor_bindings_unittests",
+      "mojo_common_unittests",
+      "mojo_js_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_service_manager_unittests",
+      "mojo_system_unittests"
     ]
   },
   "Linux Tests (dbg)(1)(32)": {
@@ -110,7 +126,15 @@
       "unit_tests",
       "views_unittests",
       "sql_unittests",
-      "webkit_compositor_bindings_unittests"
+      "webkit_compositor_bindings_unittests",
+      "mojo_common_unittests",
+      "mojo_js_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_service_manager_unittests",
+      "mojo_system_unittests"
     ]
   },
   "Linux Tests (dbg)(1)": {
@@ -153,7 +177,15 @@
       "unit_tests",
       "views_unittests",
       "sql_unittests",
-      "webkit_compositor_bindings_unittests"
+      "webkit_compositor_bindings_unittests",
+      "mojo_common_unittests",
+      "mojo_js_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_service_manager_unittests",
+      "mojo_system_unittests"
     ]
   },
   "Linux Clang (dbg)": {
@@ -169,7 +201,15 @@
       "ipc_tests",
       "sync_unit_tests",
       "unit_tests",
-      "sql_unittests"
+      "sql_unittests",
+      "mojo_common_unittests",
+      "mojo_js_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_service_manager_unittests",
+      "mojo_system_unittests"
     ]
   }
 }
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index 73b8e27..86ba62f 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -40,6 +40,14 @@
     "gtest_tests": [
       "net_unittests",
       "message_center_unittests",
+      "mojo_common_unittests",
+      "mojo_js_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_service_manager_unittests",
+      "mojo_system_unittests",
       {"test": "browser_tests", "shard_index": 2, "total_shards": 3}
     ]
   },
@@ -84,6 +92,14 @@
     "gtest_tests": [
       "net_unittests",
       "message_center_unittests",
+      "mojo_common_unittests",
+      "mojo_js_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_service_manager_unittests",
+      "mojo_system_unittests",
       {"test": "browser_tests", "shard_index": 2, "total_shards": 3}
     ]
   },
@@ -132,6 +148,14 @@
       "sql_unittests",
       "ui_unittests",
       "content_unittests",
+      "mojo_common_unittests",
+      "mojo_js_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_service_manager_unittests",
+      "mojo_system_unittests",
       {"test": "browser_tests", "shard_index": 3, "total_shards": 4}
     ]
   },
@@ -180,6 +204,14 @@
       "sql_unittests",
       "ui_unittests",
       "content_unittests",
+      "mojo_common_unittests",
+      "mojo_js_unittests",
+      "mojo_public_bindings_unittests",
+      "mojo_public_environment_unittests",
+      "mojo_public_system_unittests",
+      "mojo_public_utility_unittests",
+      "mojo_service_manager_unittests",
+      "mojo_system_unittests",
       {"test": "browser_tests", "shard_index": 3, "total_shards": 4}
     ]
   }
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index b6a07d2..93559f0 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -1,3 +1,11 @@
 [
-  "gfx_unittests"
+  "gfx_unittests",
+  "mojo_common_unittests",
+  "mojo_js_unittests",
+  "mojo_public_bindings_unittests",
+  "mojo_public_environment_unittests",
+  "mojo_public_system_unittests",
+  "mojo_public_utility_unittests",
+  "mojo_service_manager_unittests",
+  "mojo_system_unittests"
 ]