Swarm media_unittests.

media/media_unittests.isolate

Index: media/media_unittests.isolate
diff --git a/media/media_unittests.isolate b/media/media_unittests.isolate
index 3a17689503d5f09cbc1d218fc985a4a50e292f75..157d51f6e29c6c1acdb401c6038fc5ba9e131e13 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"', {

[scherkus (not reviewing), 2015/01/15 19:21:53]

is this because we don't swarm on android?

[jam, 2015/01/15 21:16:24]

originally I thought so, but then I saw (on other cls) that android uses
isolate. however, even with my change the test passes, so on android test/data
must not be used or else the try run would fail..

+    ['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',
         ],
       },
     }],