summaryrefslogtreecommitdiffstats
path: root/chrome/sync_integration_tests.isolate
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-24 14:14:14 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-24 14:14:14 +0000
commite7a1b1c95b337b5926f853656bef665a57d2f65c (patch)
treeacf8a2b4468be06a39c9a385ee6bfe768a12ea41 /chrome/sync_integration_tests.isolate
parent28a553d41969e3b864be50115e7658105ea8525a (diff)
downloadchromium_src-e7a1b1c95b337b5926f853656bef665a57d2f65c.zip
chromium_src-e7a1b1c95b337b5926f853656bef665a57d2f65c.tar.gz
chromium_src-e7a1b1c95b337b5926f853656bef665a57d2f65c.tar.bz2
Update isolate file for sync_integration_tests and enable swarming for it.
TBR=sky Review URL: https://codereview.chromium.org/417843002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/sync_integration_tests.isolate')
-rw-r--r--chrome/sync_integration_tests.isolate40
1 files changed, 24 insertions, 16 deletions
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 4736fe8..8a872a0 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -14,36 +14,33 @@
'isolate_dependency_tracked': [
'../testing/test_env.py',
'../testing/xvfb.py',
- '<(PRODUCT_DIR)/chrome_100_percent.pak',
'<(PRODUCT_DIR)/libffmpegsumo.so',
- '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
- '<(PRODUCT_DIR)/locales/en-US.pak',
- '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
- '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
- '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+ '<(PRODUCT_DIR)/libosmesa.so',
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
- 'isolate_dependency_untracked': [
- '../net/tools/testserver/',
+ },
+ }],
+ ['OS=="linux" or OS=="win"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/chrome_100_percent.pak',
+ '<(PRODUCT_DIR)/locales/en-US.pak',
],
},
}],
- ['OS=="linux" or OS=="mac"', {
+ ['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/resources.pak',
'<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_untracked': [
+ '../chrome/test/data/sync/',
+ '../net/tools/testserver/',
+ '../sync/tools/testserver/',
+ '../third_party/tlslite/',
'../third_party/pyftpdlib/',
'../third_party/pywebsocket/',
- '../third_party/tlslite/',
- ],
- },
- }],
- ['OS=="linux" or OS=="mac" or OS=="win"', {
- 'variables': {
- 'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/pyproto/',
],
},
@@ -63,5 +60,16 @@
],
},
}],
+ ['OS=="win"', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/chrome_elf.dll',
+ '<(PRODUCT_DIR)/ffmpegsumo.dll',
+ ],
+ },
+ }],
+ ],
+ 'includes': [
+ '../third_party/icu/icu.isolate',
],
}