Isolated tests: mojo_js_unittests and mojo_apps_js_unittests

mojo/mojo_js_unittests.isolate

Index: mojo/mojo_js_unittests.isolate
diff --git a/base/base_unittests.isolate b/mojo/mojo_js_unittests.isolate
similarity index 50%
copy from base/base_unittests.isolate
copy to mojo/mojo_js_unittests.isolate
index 3da5a2083d00802f1917607ef5ed9c07bc6ace4c..b9626e87b0861c78f48475a0417a0c8126db098b 100644
--- a/base/base_unittests.isolate
+++ b/mojo/mojo_js_unittests.isolate
@@ -1,62 +1,68 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.

[viettrungluu, 2014/03/15 17:14:51]

"

[yzshen1, 2014/03/16 16:52:16]

Done.

 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
+  'includes': [
+    '../third_party/icu/icu.isolate',
+  ],
   'conditions': [
-    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="linux"', {
       'variables': {
-        'isolate_dependency_untracked': [
-          'data/',
-          'test/data/',
+        'command': [
+          '../testing/xvfb.py',
+          '<(PRODUCT_DIR)',
+          '<(PRODUCT_DIR)/mojo_js_unittests<(EXECUTABLE_SUFFIX)',
+          '--brave-new-test-launcher',
+          '--test-launcher-bot-mode',
         ],
       },
     }],
-    ['OS=="linux"', {
+    ['OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)',
-          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/mojo_js_unittests<(EXECUTABLE_SUFFIX)',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
         ],
         'isolate_dependency_tracked': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+          '../testing/test_env.py',
         ],
       },
     }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="win" or OS=="mac" or OS=="linux"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+          '../gin/test/expect.js',
+          '<(PRODUCT_DIR)/mojo_js_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../tools/swarming_client/',
+          '<(PRODUCT_DIR)/gen/mojo/public/bindings/tests/',
+          'bindings/js/',
+          'public/bindings/js/',
         ],
-        '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',
-          '--test-launcher-bot-mode',
+        'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/mojo_system.dll',
+          '<(PRODUCT_DIR)/mojo_test_support.dll',
         ],
       },
     }],
-    ['OS=="win"', {
+    ['OS=="win" and component=="shared_library"', {
       'variables': {
         'isolate_dependency_tracked': [
+          '<(PRODUCT_DIR)/base.dll',
+          '<(PRODUCT_DIR)/base_i18n.dll',
+          '<(PRODUCT_DIR)/gin.dll',
+          '<(PRODUCT_DIR)/mojo_system_impl.dll',
+          '<(PRODUCT_DIR)/msvcp120d.dll',
+          '<(PRODUCT_DIR)/msvcr120d.dll',
+          '<(PRODUCT_DIR)/v8.dll',
         ],
       },
     }],
   ],
-  'includes': [
-    'base.isolate',
-    'base_prefs.isolate',
-  ],
 }