Enable service_unittests on several bot configurations

BUG=685847 Review-Url: https://codereview.chromium.org/2665453002 Cr-Commit-Position: refs/heads/master@{#446890}
Denger-Network · Jan 28, 2017 · 8cdd37a · 8cdd37a
1 parent 560640b
commit 8cdd37a
Show file tree

Hide file tree

Showing 8 changed files with 161 additions and 0 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -728,6 +728,7 @@ group("gn_only") {
     deps += [
       "//media/mojo:media_mojo_unittests",
       "//mojo/common:mojo_common_perftests",
+      "//services:service_unittests",
       "//services/video_capture:video_capture_unittests",
     ]
   }

diff --git a/services/BUILD.gn b/services/BUILD.gn
@@ -14,4 +14,9 @@ test("service_unittests") {
     "//services/image_decoder:tests",
     "//services/test:run_all_unittests",
   ]
+
+  if (is_android) {
+    # Some tests need to initialize V8.
+    deps += [ "//v8:v8_external_startup_data_assets" ]
+  }
 }
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
@@ -928,6 +928,38 @@
         },
         "test": "sandbox_linux_unittests"
       },
+      {
+        "override_isolate_target": "service_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "4",
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ],
+          "hard_timeout": 120,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "service_unittests"
+      },
       {
         "override_isolate_target": "sql_unittests",
         "swarming": {

diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
@@ -398,6 +398,15 @@
         },
         "test": "sandbox_linux_unittests"
       },
+      {
+        "args": [
+          "--ozone-platform=x11"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "args": [
           "--ozone-platform=x11"
@@ -787,6 +796,12 @@
         },
         "test": "sandbox_linux_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1127,6 +1142,12 @@
         },
         "test": "sandbox_linux_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
@@ -2192,6 +2192,38 @@
         },
         "test": "sandbox_linux_unittests"
       },
+      {
+        "override_isolate_target": "service_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:dec8cc6fd715753846d0aca1693dc63844ea55d6"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "android_devices": "4",
+              "device_os": "KTU84P",
+              "device_type": "hammerhead"
+            }
+          ],
+          "hard_timeout": 120,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ]
+        },
+        "test": "service_unittests"
+      },
       {
         "override_isolate_target": "sql_unittests",
         "swarming": {
@@ -3115,6 +3147,12 @@
         },
         "test": "service_manager_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -3715,6 +3753,12 @@
         },
         "test": "sandbox_linux_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -4112,6 +4156,12 @@
         },
         "test": "sandbox_linux_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
@@ -293,6 +293,12 @@
         },
         "test": "sandbox_mac_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -651,6 +657,12 @@
         },
         "test": "sandbox_mac_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1010,6 +1022,12 @@
         },
         "test": "sandbox_mac_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1357,6 +1375,12 @@
         },
         "test": "sandbox_mac_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
@@ -369,6 +369,12 @@
         },
         "test": "service_manager_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -821,6 +827,12 @@
         },
         "test": "sbox_validation_tests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1288,6 +1300,12 @@
         },
         "test": "service_manager_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1696,6 +1714,12 @@
         },
         "test": "sbox_validation_tests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "service_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
@@ -754,6 +754,10 @@
     "label": "//services/service_manager/tests:service_manager_unittests",
     "type": "console_test_launcher",
   },
+  "service_unittests": {
+    "label": "//services:service_unittests",
+    "type": "console_test_launcher",
+  },
   "setup_unittests": {
     "label": "//chrome/installer/setup:setup_unittests",
     "type": "console_test_launcher",