summaryrefslogtreecommitdiffstats
path: root/chrome/sync_integration_tests.isolate
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-04 22:55:24 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-04 22:55:24 +0000
commitac3589051f720543175578d3b0003ada975400b8 (patch)
tree08370d1ca6dc592cd25119d4a1d251ed2718973c /chrome/sync_integration_tests.isolate
parenta8919c097fd768c75b50b53b1b5c1e72aa6fa306 (diff)
downloadchromium_src-ac3589051f720543175578d3b0003ada975400b8.zip
chromium_src-ac3589051f720543175578d3b0003ada975400b8.tar.gz
chromium_src-ac3589051f720543175578d3b0003ada975400b8.tar.bz2
Simplify isolate files a bit.
Review URL: https://codereview.chromium.org/12387030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/sync_integration_tests.isolate')
-rw-r--r--chrome/sync_integration_tests.isolate28
1 files changed, 8 insertions, 20 deletions
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 82401cb..83b8ca1 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -4,8 +4,10 @@
{
'variables': {
'isolate_dependency_tracked': [
- '../tools/swarm_client/run_isolated.py',
- '../tools/swarm_client/run_test_cases.py',
+ ],
+ 'isolate_dependency_untracked': [
+ '../tools/swarm_client/',
+ '<(PRODUCT_DIR)/pyproto/',
],
},
'conditions': [
@@ -18,11 +20,6 @@
'<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
- '../net/tools/testserver/echo_message.py',
- '../net/tools/testserver/testserver_base.py',
- '../sync/tools/testserver/chromiumsync.py',
- '../sync/tools/testserver/sync_testserver.py',
- '../sync/tools/testserver/xmppserver.py',
'../testing/test_env.py',
'../testing/xvfb.py',
'<(PRODUCT_DIR)/chrome.pak',
@@ -36,8 +33,7 @@
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
- '<(PRODUCT_DIR)/pyproto/google/protobuf/',
- '<(PRODUCT_DIR)/pyproto/sync/protocol/',
+ '../net/tools/testserver/',
],
},
}],
@@ -62,21 +58,13 @@
}, {
'variables': {
'isolate_dependency_tracked': [
- '../net/tools/testserver/',
- '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/',
- '../third_party/tlslite/tlslite/',
- '<(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)',
],
'isolate_dependency_untracked': [
- '../third_party/pywebsocket/src/mod_pywebsocket/handshake/',
- ],
- 'isolate_dependency_touched': [
- '../third_party/pyftpdlib/src/pyftpdlib/__init__.py',
+ '../third_party/pyftpdlib/',
+ '../third_party/pywebsocket/',
+ '../third_party/tlslite/',
],
},
}],