Swarm ash_unittests.

ash/ash_unittests.isolate

-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'conditions': [
-    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="win" or chromeos==1', {

[M-A Ruel, 2014/09/29 15:07:32]

I think what you want is OS=="linux" or OS=="win".

[jam, 2014/09/29 15:24:26]

Can you explain why I'd say linux instead of chromeos==1? this test only runs on
chromeos or windows, and never linux

[M-A Ruel, 2014/09/29 15:29:43]

Then use the same check at line 18 for consistency. Do not alternate between
chromeos==1 and OS=="linux" for the same configuration, only use one.

In practice, I'd prefer stricter, e.g. use (OS=="linux" and chromeos==1) all the
time, so it is obvious to the reader.

       'variables': {
-        'isolate_dependency_untracked': [
-          'test/data/',
+        'isolate_dependency_tracked': [
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/chrome_100_percent.pak',
+          '<(PRODUCT_DIR)/chrome_200_percent.pak',
+          '<(PRODUCT_DIR)/locales/en-US.pak',
+          '<(PRODUCT_DIR)/keyboard_resources.pak',
         ],
       },
     }],
     ['OS=="linux"', {
       'variables': {
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
-          '--brave-new-test-launcher',
+          '<(PRODUCT_DIR)/ash_unittests',
           '--test-launcher-bot-mode',
         ],
         'isolate_dependency_tracked': [
           '../testing/xvfb.py',
+          '<(PRODUCT_DIR)/libffmpegsumo.so',
+          '<(PRODUCT_DIR)/libosmesa.so',
         ],
       },
     }],
     ['OS=="linux" and use_ozone==0', {
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'isolate_dependency_tracked': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'read_only': 1,
-      },
-    }],
-    ['OS=="mac" or OS=="win"', {
+    ['OS=="win"', {
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
-          '--brave-new-test-launcher',
+          '<(PRODUCT_DIR)/ash_unittests.exe',
           '--test-launcher-bot-mode',
         ],
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/ffmpegsumo.dll',
+          '<(PRODUCT_DIR)/osmesa.dll',
+        ],
       },
     }],
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
         'isolate_dependency_untracked': [
-          '<(PRODUCT_DIR)/base_unittests.exe.pdb',
+          '<(PRODUCT_DIR)/ash_unittests.exe.pdb',
         ],
       },
     }],
   ],
   'includes': [
-    'base.isolate',
+    '../base/base.isolate',
   ],
 }