Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: chrome/sync_integration_tests.isolate

Issue 417843002: Update isolate file for sync_integration_tests and enable swarming for it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | testing/buildbot/chromium_trybot.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/sync_integration_tests.isolate
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 4736fe814913b61c34f082bddb53b7940b4b220f..8a872a08f8cec0a4f99cd6b5efbaa0f79c6ab9f2 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',
],
}
« no previous file with comments | « build/all.gyp ('k') | testing/buildbot/chromium_trybot.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698