🐾 Enable instrumentation tests on Android Swarm Builder

testing/buildbot/chromium.android.json

 {
   "Android GN Builder (dbg)": {
     "additional_compile_targets": [
       "blimp_tests",
       "chrome_public_apk",
       "chrome_public_test_apk",
       "content_shell_apk",
       "content_shell_test_apk",
       "system_webview_apk"
     ]
   },
   "Android Swarm Builder": {
     "gtest_tests": [
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
+        "test": "android_webview_test_apk"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_os": "KTU84P",
+              "device_type": "hammerhead"
+            }
+          ]
+        },
         "test": "android_webview_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
         "test": "base_unittests"
       },
       {
+        "apk_under_test": "Blimp.apk",

[ghost stip (do not use), 2016/04/27 02:30:34]

this is ignored IIUC

+        "override_compile_targets": [

[ghost stip (do not use), 2016/04/27 02:30:34]

don't think you actually need this

+          "blimp_test_apk"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "blimp_unittests"
+        "test": "blimp_test_apk",
+        "test_apk": "BlimpTest.apk"

[ghost stip (do not use), 2016/04/27 02:30:34]

ignored IIUC

       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "breakpad_unittests"
+        "test": "blimp_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "cc_unittests"
+        "test": "breakpad_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "components_browsertests"
+        "test": "cc_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "components_unittests"
+        "test": "chrome_public_test_apk"

[ghost stip (do not use), 2016/04/27 02:30:34]

surprised _apk works, publicly it's chrome_public_test. guessing it's because of
https://codereview.chromium.org/1918823006/diff/20001/testing/buildbot/gn_iso...
though

[jbudorick, 2016/04/27 03:03:05]

it doesn't:
https://build.chromium.org/p/chromium.android/builders/Android%20Swarm%20Buil...

"chrome_public_test_apk_apk_run"

[jbudorick, 2016/04/27 03:25:07]

and this actually brings up another interesting blocker (that may or may not
have come up already in other channels, I don't remember): the _apk_run targets
that would be generated here had we left off the terminal _apk don't exist in
gn.

       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "content_browsertests"
+        "test": "chrome_sync_shell_test_apk"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "content_unittests"
+        "test": "components_browsertests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "device_unittests"
+        "test": "components_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "events_unittests"
+        "test": "content_browsertests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "gl_tests"
+        "test": "content_shell_test_apk"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "gpu_unittests"
+        "test": "content_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "ipc_tests"
+        "test": "device_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "media_unittests"
+        "test": "events_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "net_unittests"
+        "test": "gl_tests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "sandbox_linux_unittests"
+        "test": "gpu_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "sql_unittests"
+        "test": "ipc_tests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "sync_unit_tests"
+        "test": "media_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "ui_android_unittests"
+        "test": "net_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "ui_base_unittests"
+        "test": "sandbox_linux_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "ui_touch_selection_unittests"
+        "test": "sql_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "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": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "blimp_test_apk",
-        "test_apk": "BlimpTest.apk"
+        "test": "ui_android_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "chrome_public_test_apk"
+        "test": "ui_base_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "chrome_sync_shell_test_apk"
+        "test": "ui_touch_selection_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
               "device_os": "KTU84P",
               "device_type": "hammerhead"
             }
           ]
         },
-        "test": "content_shell_test_apk"
+        "test": "unit_tests"
       }
     ]
   },
   "Jelly Bean Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
@@ skipping 819 matching lines @@
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ]
   }
 }