Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / unit_tests.isolate

diff --git a/src/chrome/unit_tests.isolate b/src/chrome/unit_tests.isolate
index a69b4a3..a78618a 100644 (file)
--- a/src/chrome/unit_tests.isolate
+++ b/src/chrome/unit_tests.isolate
@@ -5,25 +5,23 @@
   'conditions': [
     ['OS=="android" or OS=="linux"', {
       'variables': {
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/test_data/',
         ],
       },
     }],
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '../third_party/accessibility-audit/axs_testing.js',
-          '../tools/metrics/histograms/histograms.xml',
-          '<(PRODUCT_DIR)/resources.pak',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../base/test/data/',
           '../components/test/data/',
           '../extensions/test/data/',
           '../net/data/',
+          '../third_party/accessibility-audit/axs_testing.js',
           '../third_party/hunspell_dictionaries/',
           '../third_party/zlib/google/test/data/',
+          '../tools/metrics/histograms/histograms.xml',
+          '<(PRODUCT_DIR)/resources.pak',
           'test/data/',
           'third_party/mock4js/',
         ],
@@ -31,7 +29,7 @@
     }],
     ['OS=="android" or OS=="linux" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/locales/en-US.pak',
         ],
@@ -45,8 +43,10 @@
           '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
         ],
-        'isolate_dependency_tracked': [
+        'files': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
@@ -56,43 +56,38 @@
     }],
     ['OS=="linux" and use_ozone==0', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../net/tools/testserver/',
+          '../testing/test_env.py',
           '../third_party/pyftpdlib/',
           '../third_party/pywebsocket/',
           '../third_party/tlslite/',
           '<(PRODUCT_DIR)/pyproto/',
           '<(PRODUCT_DIR)/test_data/',
+          '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac"', {
       'variables': {
-        # Can't be enabled on Windows due to http://crbug.com/342913
         'read_only': 1,
       },
     }],
     ['OS=="mac"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
+          '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
           '<(PRODUCT_DIR)/exif.so',
           '<(PRODUCT_DIR)/ffmpegsumo.so',
           '<(PRODUCT_DIR)/osmesa.so',
         ],
-        'isolate_dependency_untracked': [
-          '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
-        ],
       },
     }],
     ['OS=="mac" or OS=="win"', {
@@ -102,12 +97,17 @@
           '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
+          '--asan=<(asan)',
+          '--lsan=<(lsan)',
         ],
       },
     }],
     ['OS=="win"', {
       'variables': {
-        'isolate_dependency_tracked': [
+        'files': [
+          '../ppapi/lib/gl/include/KHR/',
+          '../skia/ext/data/',
+          '../ui/base/glib/',
           '<(PRODUCT_DIR)/blacklist_test_dll_1.dll',
           '<(PRODUCT_DIR)/chrome_elf.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
@@ -117,32 +117,28 @@
           '<(PRODUCT_DIR)/verifier_test_dll_2.dll',
           'test/data/safe_browsing/signed_binary.dll',
         ],
-        'isolate_dependency_untracked': [
-          '../ppapi/lib/gl/include/KHR/',
-          '../skia/ext/data/',
-          '../ui/base/glib/',
-        ],
+        # Can't be enabled on Windows due to http://crbug.com/342913
+        'read_only': 0,
       },
     }],
     ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
       'variables': {
-        'isolate_dependency_untracked': [
+        'files': [
           '<(PRODUCT_DIR)/unit_tests.exe.pdb',
         ],
       },
     }],
     ['chromeos==1', {
       'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/libexif.so',
-        ],
-        'isolate_dependency_untracked': [
+        'files': [
           '../chromeos/test/data/network/',
+          '<(PRODUCT_DIR)/libexif.so',
         ],
       },
     }],
   ],
   'includes': [
     '../base/base.isolate',
+    '../gin/v8.isolate',
   ],
 }