Swarm media_unittests.

BUG=448877

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

Cr-Commit-Position: refs/heads/master@{#311756}

6 files changed, 91 insertions, 21 deletions

diff --git a/media/media.gyp b/media/media.gyp
index 9aba019..1c0f0a9 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1907,7 +1907,7 @@
         },
       ],
     }],
-    ['test_isolation_mode != "noop" and archive_gpu_tests==1', {
+    ['test_isolation_mode != "noop"', {
       'targets': [
         {
           'target_name': 'media_unittests_run',
diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate
index 3a17689..157d51f 100644
--- a/media/media_unittests.isolate
+++ b/media/media_unittests.isolate
@@ -6,42 +6,67 @@
     '../base/base.isolate',
   ],
   'conditions': [
-    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           'test/data/',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="linux"', {
       'variables': {
         'command': [
-          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)',
+          '<(PRODUCT_DIR)/media_unittests',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
         ],
         'files': [
-          '<(PRODUCT_DIR)/media_unittests<(EXECUTABLE_SUFFIX)',
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/xdisplaycheck',
         ],
       },
     }],
-    # TODO(jmadill): should be automatic. http://crbug.com/418146
-    ['OS=="win"', {
+    ['OS=="mac"', {
       'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/media_unittests',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+        ],
         'files': [
-          '<(PRODUCT_DIR)/ffmpegsumo.dll',
+          '<(PRODUCT_DIR)/ffmpegsumo.so',
         ],
       },
     }],
-    ['OS=="mac"', {
+    ['OS=="win"', {
       'variables': {
+        'command': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/media_unittests.exe',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
+        ],
         'files': [
-          '<(PRODUCT_DIR)/ffmpegsumo.so',
+          '<(PRODUCT_DIR)/ffmpegsumo.dll',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/media_unittests.exe.pdb',
         ],
       },
     }],
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 258b031..57434fa 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -81,7 +81,12 @@
       "ipc_mojo_unittests",
       "ipc_tests",
       "jingle_unittests",
-      "media_unittests",
+      {
+        "test": "media_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "mojo_common_unittests",
       "mojo_public_bindings_unittests",
       "mojo_public_environment_unittests",
@@ -231,7 +236,12 @@
       "ipc_mojo_unittests",
       "ipc_tests",
       "jingle_unittests",
-      "media_unittests",
+      {
+        "test": "media_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "mojo_common_unittests",
       "mojo_public_bindings_unittests",
       "mojo_public_environment_unittests",
@@ -370,7 +380,12 @@
       "ipc_mojo_unittests",
       "ipc_tests",
       "jingle_unittests",
-      "media_unittests",
+      {
+        "test": "media_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       "mojo_common_unittests",
       "mojo_public_bindings_unittests",
       "mojo_public_environment_unittests",
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json
index ccf955b..0f82147 100644
--- a/testing/buildbot/chromium.mac.json
+++ b/testing/buildbot/chromium.mac.json
@@ -67,7 +67,12 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      "media_unittests",
+      {
+        "test": "media_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       {
         "test": "message_center_unittests",
         "swarming": {
@@ -196,7 +201,12 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      "media_unittests",
+      {
+        "test": "media_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       {
         "test": "message_center_unittests",
         "swarming": {
@@ -325,7 +335,12 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      "media_unittests",
+      {
+        "test": "media_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       {
         "test": "message_center_unittests",
         "swarming": {
@@ -455,7 +470,12 @@
       },
       "ipc_tests",
       "jingle_unittests",
-      "media_unittests",
+      {
+        "test": "media_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        }
+      },
       {
         "test": "message_center_unittests",
         "swarming": {
diff --git a/testing/buildbot/chromium_memory_trybot.json b/testing/buildbot/chromium_memory_trybot.json
index 5d1652c..ee5c2ac3 100644
--- a/testing/buildbot/chromium_memory_trybot.json
+++ b/testing/buildbot/chromium_memory_trybot.json
@@ -54,7 +54,12 @@
     },
     "ipc_tests",
     "jingle_unittests",
-    "media_unittests",
+    {
+      "test": "media_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "net_unittests",
       "swarming": {
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index d65c503..63c3f39 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -140,7 +140,12 @@
       "platforms": ["linux", "win"]
     },
     "media_perftests",
-    "media_unittests",
+    {
+      "test": "media_unittests",
+      "swarming": {
+        "can_use_on_swarming_builders": true
+      }
+    },
     {
       "test": "message_center_unittests",
       "swarming": {