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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser_tests.isolate

Issue 12208124: Pass the chromeos build variable to isolate.py in _run targets, and update browser_tests.isolate to… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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/isolate.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser_tests.isolate
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 0ba8ac0b6af45a296e4d149f305d8c6c7622bb94..242e7e028a847453b2e6f00560a878f10113df4e 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -2,135 +2,108 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
- 'variables': {
- 'isolate_dependency_tracked': [
- '../net/data/ssl/certificates/expired_cert.pem',
- '../net/data/ssl/certificates/ok_cert.pem',
- '../net/data/ssl/certificates/root_ca_cert.crt',
- '../net/tools/testserver/asn1.py',
- '../net/tools/testserver/echo_message.py',
- '../net/tools/testserver/minica.py',
- '../net/tools/testserver/testserver.py',
- '../net/tools/testserver/testserver_base.py',
- '../ppapi/tests/test_case.html',
- '../ppapi/tests/test_page.css',
- '../testing/test_env.py',
- '../third_party/pyftpdlib/src/pyftpdlib/__init__.py',
- '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/__init__.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/_stream_base.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hixie75.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hybi.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/common.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/dispatch.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/extensions.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/http_header_util.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/memorizingfile.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/msgutil.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/mux.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/standalone.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/stream.py',
- '../third_party/pywebsocket/src/mod_pywebsocket/util.py',
- '../third_party/tlslite/tlslite/BaseDB.py',
- '../third_party/tlslite/tlslite/Checker.py',
- '../third_party/tlslite/tlslite/FileObject.py',
- '../third_party/tlslite/tlslite/HandshakeSettings.py',
- '../third_party/tlslite/tlslite/Session.py',
- '../third_party/tlslite/tlslite/SessionCache.py',
- '../third_party/tlslite/tlslite/SharedKeyDB.py',
- '../third_party/tlslite/tlslite/TLSConnection.py',
- '../third_party/tlslite/tlslite/TLSRecordLayer.py',
- '../third_party/tlslite/tlslite/VerifierDB.py',
- '../third_party/tlslite/tlslite/X509.py',
- '../third_party/tlslite/tlslite/X509CertChain.py',
- '../third_party/tlslite/tlslite/__init__.py',
- '../third_party/tlslite/tlslite/api.py',
- '../third_party/tlslite/tlslite/constants.py',
- '../third_party/tlslite/tlslite/errors.py',
- '../third_party/tlslite/tlslite/integration/AsyncStateMachine.py',
- '../third_party/tlslite/tlslite/integration/ClientHelper.py',
- '../third_party/tlslite/tlslite/integration/HTTPTLSConnection.py',
- '../third_party/tlslite/tlslite/integration/IMAP4_TLS.py',
- '../third_party/tlslite/tlslite/integration/POP3_TLS.py',
- '../third_party/tlslite/tlslite/integration/SMTP_TLS.py',
- '../third_party/tlslite/tlslite/integration/TLSAsyncDispatcherMixIn.py',
- '../third_party/tlslite/tlslite/integration/TLSSocketServerMixIn.py',
- '../third_party/tlslite/tlslite/integration/XMLRPCTransport.py',
- '../third_party/tlslite/tlslite/integration/__init__.py',
- '../third_party/tlslite/tlslite/mathtls.py',
- '../third_party/tlslite/tlslite/messages.py',
- '../third_party/tlslite/tlslite/utils/AES.py',
- '../third_party/tlslite/tlslite/utils/ASN1Parser.py',
- '../third_party/tlslite/tlslite/utils/Python_AES.py',
- '../third_party/tlslite/tlslite/utils/Python_RC4.py',
- '../third_party/tlslite/tlslite/utils/Python_RSAKey.py',
- '../third_party/tlslite/tlslite/utils/RC4.py',
- '../third_party/tlslite/tlslite/utils/RSAKey.py',
- '../third_party/tlslite/tlslite/utils/__init__.py',
- '../third_party/tlslite/tlslite/utils/cipherfactory.py',
- '../third_party/tlslite/tlslite/utils/codec.py',
- '../third_party/tlslite/tlslite/utils/compat.py',
- '../third_party/tlslite/tlslite/utils/cryptomath.py',
- '../third_party/tlslite/tlslite/utils/hmac.py',
- '../third_party/tlslite/tlslite/utils/keyfactory.py',
- '../third_party/tlslite/tlslite/utils/rijndael.py',
- '../third_party/tlslite/tlslite/utils/xmltools.py',
- '../tools/swarm_client/run_isolated.py',
- '../tools/swarm_client/run_test_cases.py',
- '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
- '<(PRODUCT_DIR)/resources.pak',
- 'common/extensions/docs/examples/apps/calculator/app/model.js',
- 'third_party/mock4js/mock4js.js',
- ],
- 'isolate_dependency_untracked': [
- '../content/test/data/',
- '../third_party/pywebsocket/src/mod_pywebsocket/handshake/',
- '<(PRODUCT_DIR)/nacl_test_data/',
- '<(PRODUCT_DIR)/pnacl/',
- '<(PRODUCT_DIR)/pseudo_locales/',
- '<(PRODUCT_DIR)/test_data/chrome/',
- 'common/extensions/docs/examples/apps/calculator/tests/',
- 'test/data/',
- ],
- },
'conditions': [
- ['OS=="linux"', {
+ ['(OS=="linux" and chromeos==1) or ((OS=="linux" or OS=="mac" or OS=="win") and chromeos==0)', {
'variables': {
- 'command': [
- '../testing/xvfb.py',
- '<(PRODUCT_DIR)',
+ 'isolate_dependency_tracked': [
+ '../net/data/ssl/certificates/expired_cert.pem',
+ '../net/data/ssl/certificates/ok_cert.pem',
+ '../net/data/ssl/certificates/root_ca_cert.crt',
+ '../net/tools/testserver/asn1.py',
+ '../net/tools/testserver/echo_message.py',
+ '../net/tools/testserver/minica.py',
+ '../net/tools/testserver/testserver.py',
+ '../net/tools/testserver/testserver_base.py',
+ '../ppapi/tests/test_case.html',
+ '../ppapi/tests/test_page.css',
+ '../testing/test_env.py',
+ '../third_party/pyftpdlib/src/pyftpdlib/__init__.py',
+ '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/__init__.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/_stream_base.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hixie75.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/_stream_hybi.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/common.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/dispatch.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/extensions.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/http_header_util.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/memorizingfile.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/msgutil.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/mux.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/standalone.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/stream.py',
+ '../third_party/pywebsocket/src/mod_pywebsocket/util.py',
+ '../third_party/tlslite/tlslite/BaseDB.py',
+ '../third_party/tlslite/tlslite/Checker.py',
+ '../third_party/tlslite/tlslite/FileObject.py',
+ '../third_party/tlslite/tlslite/HandshakeSettings.py',
+ '../third_party/tlslite/tlslite/Session.py',
+ '../third_party/tlslite/tlslite/SessionCache.py',
+ '../third_party/tlslite/tlslite/SharedKeyDB.py',
+ '../third_party/tlslite/tlslite/TLSConnection.py',
+ '../third_party/tlslite/tlslite/TLSRecordLayer.py',
+ '../third_party/tlslite/tlslite/VerifierDB.py',
+ '../third_party/tlslite/tlslite/X509.py',
+ '../third_party/tlslite/tlslite/X509CertChain.py',
+ '../third_party/tlslite/tlslite/__init__.py',
+ '../third_party/tlslite/tlslite/api.py',
+ '../third_party/tlslite/tlslite/constants.py',
+ '../third_party/tlslite/tlslite/errors.py',
+ '../third_party/tlslite/tlslite/integration/AsyncStateMachine.py',
+ '../third_party/tlslite/tlslite/integration/ClientHelper.py',
+ '../third_party/tlslite/tlslite/integration/HTTPTLSConnection.py',
+ '../third_party/tlslite/tlslite/integration/IMAP4_TLS.py',
+ '../third_party/tlslite/tlslite/integration/POP3_TLS.py',
+ '../third_party/tlslite/tlslite/integration/SMTP_TLS.py',
+ '../third_party/tlslite/tlslite/integration/TLSAsyncDispatcherMixIn.py',
+ '../third_party/tlslite/tlslite/integration/TLSSocketServerMixIn.py',
+ '../third_party/tlslite/tlslite/integration/XMLRPCTransport.py',
+ '../third_party/tlslite/tlslite/integration/__init__.py',
+ '../third_party/tlslite/tlslite/mathtls.py',
+ '../third_party/tlslite/tlslite/messages.py',
+ '../third_party/tlslite/tlslite/utils/AES.py',
+ '../third_party/tlslite/tlslite/utils/ASN1Parser.py',
+ '../third_party/tlslite/tlslite/utils/Python_AES.py',
+ '../third_party/tlslite/tlslite/utils/Python_RC4.py',
+ '../third_party/tlslite/tlslite/utils/Python_RSAKey.py',
+ '../third_party/tlslite/tlslite/utils/RC4.py',
+ '../third_party/tlslite/tlslite/utils/RSAKey.py',
+ '../third_party/tlslite/tlslite/utils/__init__.py',
+ '../third_party/tlslite/tlslite/utils/cipherfactory.py',
+ '../third_party/tlslite/tlslite/utils/codec.py',
+ '../third_party/tlslite/tlslite/utils/compat.py',
+ '../third_party/tlslite/tlslite/utils/cryptomath.py',
+ '../third_party/tlslite/tlslite/utils/hmac.py',
+ '../third_party/tlslite/tlslite/utils/keyfactory.py',
+ '../third_party/tlslite/tlslite/utils/rijndael.py',
+ '../third_party/tlslite/tlslite/utils/xmltools.py',
+ '../tools/swarm_client/run_isolated.py',
'../tools/swarm_client/run_test_cases.py',
- '--use-less-jobs',
'<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/resources.pak',
+ 'common/extensions/docs/examples/apps/calculator/app/model.js',
+ 'third_party/mock4js/mock4js.js',
+ ],
+ 'isolate_dependency_untracked': [
+ '../content/test/data/',
+ '../third_party/pywebsocket/src/mod_pywebsocket/handshake/',
+ '<(PRODUCT_DIR)/nacl_test_data/',
+ '<(PRODUCT_DIR)/pnacl/',
+ '<(PRODUCT_DIR)/pseudo_locales/',
+ '<(PRODUCT_DIR)/test_data/chrome/',
+ 'common/extensions/docs/examples/apps/calculator/tests/',
+ 'test/data/',
],
+ },
+ }],
+ ['(OS=="mac" and chromeos==0) or (OS=="linux" and (chromeos==0 or chromeos==1))', {
+ 'variables': {
'isolate_dependency_tracked': [
- '../net/data/ssl/certificates/websocket_cacert.pem',
- '../net/data/ssl/certificates/websocket_client_cert.p12',
- '../testing/xvfb.py',
- '../third_party/WebKit/Tools/Scripts/VCSUtils.pm',
- '../third_party/WebKit/Tools/Scripts/new-run-webkit-httpd',
- '../third_party/WebKit/Tools/Scripts/webkit-build-directory',
- '../third_party/WebKit/Tools/Scripts/webkitdirs.pm',
- '../third_party/tlslite/tlslite/utils/PyCrypto_AES.py',
- '../third_party/tlslite/tlslite/utils/PyCrypto_RC4.py',
- '../third_party/tlslite/tlslite/utils/PyCrypto_RSAKey.py',
- '../third_party/tlslite/tlslite/utils/PyCrypto_TripleDES.py',
- '../third_party/tlslite/tlslite/utils/TripleDES.py',
- '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)',
- '<(PRODUCT_DIR)/chrome.pak',
- '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
- '<(PRODUCT_DIR)/libffmpegsumo.so',
- '<(PRODUCT_DIR)/libosmesa.so',
- '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
- '<(PRODUCT_DIR)/libppapi_tests.so',
- '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
- '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
- '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
- 'browser/nacl_host/test/debug_stub_browser_tests.py',
- 'browser/nacl_host/test/gdb_rsp.py',
+ '../third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py',
],
},
- }, {
+ }],
+ ['(OS=="mac" or OS=="win") and chromeos==0', {
'variables': {
'command': [
'../testing/test_env.py',
@@ -140,22 +113,7 @@
],
},
}],
- ['OS=="mac"', {
- 'variables': {
- 'isolate_dependency_tracked': [
- '<(PRODUCT_DIR)/ffmpegsumo.so',
- '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/Info.plist',
- '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/MacOS/TestNetscapePlugIn',
- '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/Info.plist',
- '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/MacOS/npapi_test_plugin',
- '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
- ],
- 'isolate_dependency_untracked': [
- '<(PRODUCT_DIR)/Chromium Framework.framework/',
- '<(PRODUCT_DIR)/Chromium.app/',
- ],
- },
- }, {
+ ['(OS=="win" and chromeos==0) or (OS=="linux" and (chromeos==0 or chromeos==1))', {
'variables': {
'isolate_dependency_tracked': [
'../third_party/WebKit/Tools/Scripts/new-run-webkit-websocketserver',
@@ -217,7 +175,60 @@
],
},
}],
- ['OS=="win"', {
+ ['OS=="linux" and (chromeos==0 or chromeos==1)', {
+ 'variables': {
+ 'command': [
+ '../testing/xvfb.py',
+ '<(PRODUCT_DIR)',
+ '../tools/swarm_client/run_test_cases.py',
+ '--use-less-jobs',
+ '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
+ ],
+ 'isolate_dependency_tracked': [
+ '../net/data/ssl/certificates/websocket_cacert.pem',
+ '../net/data/ssl/certificates/websocket_client_cert.p12',
+ '../testing/xvfb.py',
+ '../third_party/WebKit/Tools/Scripts/VCSUtils.pm',
+ '../third_party/WebKit/Tools/Scripts/new-run-webkit-httpd',
+ '../third_party/WebKit/Tools/Scripts/webkit-build-directory',
+ '../third_party/WebKit/Tools/Scripts/webkitdirs.pm',
+ '../third_party/tlslite/tlslite/utils/PyCrypto_AES.py',
+ '../third_party/tlslite/tlslite/utils/PyCrypto_RC4.py',
+ '../third_party/tlslite/tlslite/utils/PyCrypto_RSAKey.py',
+ '../third_party/tlslite/tlslite/utils/PyCrypto_TripleDES.py',
+ '../third_party/tlslite/tlslite/utils/TripleDES.py',
+ '<(PRODUCT_DIR)/DumpRenderTree<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/chrome.pak',
+ '<(PRODUCT_DIR)/chrome<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/libffmpegsumo.so',
+ '<(PRODUCT_DIR)/libosmesa.so',
+ '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
+ '<(PRODUCT_DIR)/libppapi_tests.so',
+ '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
+ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
+ 'browser/nacl_host/test/debug_stub_browser_tests.py',
+ 'browser/nacl_host/test/gdb_rsp.py',
+ ],
+ },
+ }],
+ ['OS=="mac" and chromeos==0', {
+ 'variables': {
+ 'isolate_dependency_tracked': [
+ '<(PRODUCT_DIR)/ffmpegsumo.so',
+ '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/Info.plist',
+ '<(PRODUCT_DIR)/plugins/TestNetscapePlugIn.plugin/Contents/MacOS/TestNetscapePlugIn',
+ '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/Info.plist',
+ '<(PRODUCT_DIR)/plugins/npapi_test_plugin.plugin/Contents/MacOS/npapi_test_plugin',
+ '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests',
+ ],
+ 'isolate_dependency_untracked': [
+ '<(PRODUCT_DIR)/Chromium Framework.framework/',
+ '<(PRODUCT_DIR)/Chromium.app/',
+ ],
+ },
+ }],
+ ['OS=="win" and chromeos==0', {
'variables': {
'isolate_dependency_tracked': [
'../native_client/build/build_nexe.py',
@@ -245,12 +256,6 @@
'<(PRODUCT_DIR)/gen/sdk/toolchain/win_x86_pnacl/newlib/bin/pydir/',
],
},
- }, {
- 'variables': {
- 'isolate_dependency_tracked': [
- '../third_party/tlslite/tlslite/integration/TLSTwistedProtocolWrapper.py',
- ],
- },
}],
],
}
« no previous file with comments | « build/isolate.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698