Index: chrome/chrome.isolate |
diff --git a/chrome/sync_integration_tests.isolate b/chrome/chrome.isolate |
similarity index 53% |
copy from chrome/sync_integration_tests.isolate |
copy to chrome/chrome.isolate |
index 76cf74e0f30cebbc630bb6625838663811053839..6406348d40f68de6aa35f22e1250ee8a698afcb8 100644 |
--- a/chrome/sync_integration_tests.isolate |
+++ b/chrome/chrome.isolate |
@@ -1,61 +1,47 @@ |
-# Copyright 2012 The Chromium Authors. All rights reserved. |
+# Copyright (c) 2013 The Chromium Authors. All rights reserved. |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
{ |
'conditions': [ |
['OS=="linux"', { |
'variables': { |
- 'command': [ |
- '../testing/xvfb.py', |
- '<(PRODUCT_DIR)', |
- '../tools/swarm_client/run_test_cases.py', |
- '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', |
- ], |
'isolate_dependency_tracked': [ |
- '../testing/test_env.py', |
- '../testing/xvfb.py', |
'<(PRODUCT_DIR)/chrome.pak', |
- '<(PRODUCT_DIR)/chrome_100_percent.pak', |
+ '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)', |
+ '<(PRODUCT_DIR)/libclearkeycdm.so', |
+ '<(PRODUCT_DIR)/libclearkeycdmadapter.so', |
'<(PRODUCT_DIR)/libffmpegsumo.so', |
+ '<(PRODUCT_DIR)/libosmesa.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)/xdisplaycheck<(EXECUTABLE_SUFFIX)', |
- ], |
- 'isolate_dependency_untracked': [ |
- '../net/tools/testserver/', |
], |
}, |
}], |
- ['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': [ |
- '../third_party/pyftpdlib/', |
- '../third_party/pywebsocket/', |
- '../third_party/tlslite/', |
], |
}, |
}], |
- ['OS=="linux" or OS=="mac" or OS=="win"', { |
+ ['OS=="linux" or OS=="win"', { |
'variables': { |
+ 'isolate_dependency_tracked': [ |
+ '<(PRODUCT_DIR)/chrome_100_percent.pak', |
+ '<(PRODUCT_DIR)/locales/en-US.pak', |
+ '<(PRODUCT_DIR)/locales/fr.pak', |
+ '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
+ ], |
'isolate_dependency_untracked': [ |
- '../tools/swarm_client/', |
- '<(PRODUCT_DIR)/pyproto/', |
+ '<(PRODUCT_DIR)/lib64/', |
+ '<(PRODUCT_DIR)/plugins/', |
+ '<(PRODUCT_DIR)/resources/extension/', |
], |
}, |
}], |
['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', |
], |
@@ -65,5 +51,22 @@ |
], |
}, |
}], |
+ ['OS=="win"', { |
+ 'variables': { |
+ 'isolate_dependency_tracked': [ |
+ '<(PRODUCT_DIR)/D3DCompiler_43.dll', |
+ '<(PRODUCT_DIR)/clearkeycdm.dll', |
+ '<(PRODUCT_DIR)/clearkeycdmadapter.dll', |
+ '<(PRODUCT_DIR)/d3dcompiler_46.dll', |
+ '<(PRODUCT_DIR)/ffmpegsumo.dll', |
+ '<(PRODUCT_DIR)/icudt.dll', |
+ '<(PRODUCT_DIR)/libEGL.dll', |
+ '<(PRODUCT_DIR)/libGLESv2.dll', |
+ '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)', |
+ '<(PRODUCT_DIR)/osmesa.dll', |
+ '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
+ ], |
+ }, |
+ }], |
], |
} |