🐾 Enable instrumentation tests on Android Swarm Builder

testing/buildbot/chromium.android.json

Index: testing/buildbot/chromium.android.json
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index f0da75c1b0cb5493f9ce838e528dda1e228bb8b5..0352f88e9c5d71346bb32d01877aee6f0619538a 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -36,6 +36,10 @@
         "test": "base_unittests"
       },

[jbudorick, 2016/04/27 00:58:43]

This was previously missing android_webview_test_apk; it should be here, too.

[agrieve, 2016/04/27 01:03:18]

good catch. added.

       {
+        "apk_under_test": "Blimp.apk",
+        "override_compile_targets": [
+          "blimp_test_apk"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -45,7 +49,8 @@
             }
           ]
         },
-        "test": "blimp_unittests"
+        "test": "blimp_test_apk",
+        "test_apk": "BlimpTest.apk"
       },
       {
         "swarming": {
@@ -57,7 +62,7 @@
             }
           ]
         },
-        "test": "breakpad_unittests"
+        "test": "blimp_unittests"
       },
       {
         "swarming": {
@@ -69,7 +74,7 @@
             }
           ]
         },
-        "test": "cc_unittests"
+        "test": "breakpad_unittests"
       },
       {
         "swarming": {
@@ -81,7 +86,7 @@
             }
           ]
         },
-        "test": "components_browsertests"
+        "test": "cc_unittests"
       },
       {
         "swarming": {
@@ -93,7 +98,7 @@
             }
           ]
         },
-        "test": "components_unittests"
+        "test": "chrome_public_test_apk"
       },
       {
         "swarming": {
@@ -105,7 +110,7 @@
             }
           ]
         },
-        "test": "content_browsertests"
+        "test": "chrome_sync_shell_test_apk"
       },
       {
         "swarming": {
@@ -117,7 +122,7 @@
             }
           ]
         },
-        "test": "content_unittests"
+        "test": "components_browsertests"
       },
       {
         "swarming": {
@@ -129,7 +134,7 @@
             }
           ]
         },
-        "test": "device_unittests"
+        "test": "components_unittests"
       },
       {
         "swarming": {
@@ -141,7 +146,7 @@
             }
           ]
         },
-        "test": "events_unittests"
+        "test": "content_browsertests"
       },
       {
         "swarming": {
@@ -153,7 +158,7 @@
             }
           ]
         },
-        "test": "gl_tests"
+        "test": "content_shell_test_apk"
       },
       {
         "swarming": {
@@ -165,7 +170,7 @@
             }
           ]
         },
-        "test": "gpu_unittests"
+        "test": "content_unittests"
       },
       {
         "swarming": {
@@ -177,7 +182,7 @@
             }
           ]
         },
-        "test": "ipc_tests"
+        "test": "device_unittests"
       },
       {
         "swarming": {
@@ -189,7 +194,7 @@
             }
           ]
         },
-        "test": "media_unittests"
+        "test": "events_unittests"
       },
       {
         "swarming": {
@@ -201,7 +206,7 @@
             }
           ]
         },
-        "test": "net_unittests"
+        "test": "gl_tests"
       },
       {
         "swarming": {
@@ -213,7 +218,7 @@
             }
           ]
         },
-        "test": "sandbox_linux_unittests"
+        "test": "gpu_unittests"
       },
       {
         "swarming": {
@@ -225,7 +230,7 @@
             }
           ]
         },
-        "test": "sql_unittests"
+        "test": "ipc_tests"
       },
       {
         "swarming": {
@@ -237,7 +242,7 @@
             }
           ]
         },
-        "test": "sync_unit_tests"
+        "test": "media_unittests"
       },
       {
         "swarming": {
@@ -249,7 +254,7 @@
             }
           ]
         },
-        "test": "ui_android_unittests"
+        "test": "net_unittests"
       },
       {
         "swarming": {
@@ -261,7 +266,7 @@
             }
           ]
         },
-        "test": "ui_base_unittests"
+        "test": "sandbox_linux_unittests"
       },
       {
         "swarming": {
@@ -273,7 +278,7 @@
             }
           ]
         },
-        "test": "ui_touch_selection_unittests"
+        "test": "sql_unittests"
       },
       {
         "swarming": {
@@ -285,15 +290,9 @@
             }
           ]
         },
-        "test": "unit_tests"
-      }
-    ],
-    "instrumentation_tests": [
+        "test": "sync_unit_tests"
+      },
       {
-        "apk_under_test": "Blimp.apk",
-        "override_compile_targets": [
-          "blimp_test_apk"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -303,8 +302,7 @@
             }
           ]
         },
-        "test": "blimp_test_apk",
-        "test_apk": "BlimpTest.apk"
+        "test": "ui_android_unittests"
       },
       {
         "swarming": {
@@ -316,7 +314,7 @@
             }
           ]
         },
-        "test": "chrome_public_test_apk"
+        "test": "ui_base_unittests"
       },
       {
         "swarming": {
@@ -328,7 +326,7 @@
             }
           ]
         },
-        "test": "chrome_sync_shell_test_apk"
+        "test": "ui_touch_selection_unittests"
       },
       {
         "swarming": {
@@ -340,7 +338,7 @@
             }
           ]
         },
-        "test": "content_shell_test_apk"
+        "test": "unit_tests"
       }
     ]
   },