diff options
Diffstat (limited to 'chrome/sync_integration_tests.isolate')
| -rw-r--r-- | chrome/sync_integration_tests.isolate | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index b20be04..bd6b85b 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -12,13 +12,8 @@ '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../net/tools/testserver/', '../testing/test_env.py', '../testing/xvfb.py', - '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py', - '../third_party/pywebsocket/src/mod_pywebsocket/', - '../third_party/tlslite/tlslite/', - '../tools/swarm_client/run_test_cases.py', '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/libffmpegsumo.so', @@ -27,19 +22,47 @@ '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ['OS=="mac"', { + 'variables': { + 'command': [ + '../tools/swarm_client/run_test_cases.py', + '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/ffmpegsumo.so', + ], + 'isolate_dependency_untracked': [ + '<(PRODUCT_DIR)/Chromium Framework.framework/', + '<(PRODUCT_DIR)/Chromium.app/', + ], + }, + }], + ['OS=="win"', { + 'variables': { + }, + }, { + 'variables': { + 'isolate_dependency_tracked': [ + '../net/tools/testserver/', + '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py', + '../third_party/pywebsocket/src/mod_pywebsocket/', + '../third_party/tlslite/tlslite/', + '../tools/swarm_client/run_test_cases.py', '<(PRODUCT_DIR)/pyproto/google/__init__.py', '<(PRODUCT_DIR)/pyproto/google/protobuf/', '<(PRODUCT_DIR)/pyproto/sync/protocol/', '<(PRODUCT_DIR)/resources.pak', '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ '../third_party/pywebsocket/src/mod_pywebsocket/handshake/', ], 'isolate_dependency_touched': [ '../third_party/pyftpdlib/src/pyftpdlib/__init__.py', - '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', ], }, }], |