From 52f1a7e63128f2a4f644e1a28a6744b916585999 Mon Sep 17 00:00:00 2001 From: "rsimha@chromium.org" Date: Thu, 18 Oct 2012 18:13:39 +0000 Subject: [sync] Isolate sync_integration_tests and its dependencies (mac) In order to run a chrome test suite on a buildbot without checking out the entire chromium source tree, we need to copy over the transtitive closure of the test suite and all its dependencies. Doing so manually is tedious, error prone, and brittle. This patch updates the .isolate file for sync_integration_tests and modifies its corresponding test target in chrome_tests.gypi. This will enable us to copy sync_integration_tests to other tester buildbots in order to run them as part of cross platform integration tests. We plan on using this on the bling buildbots for sync. TBR=thakis@chromium.org BUG=155531, b/6942067 Review URL: https://codereview.chromium.org/11195035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162738 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/sync_integration_tests.isolate | 37 ++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'chrome/sync_integration_tests.isolate') diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate index b20be04..bd6b85b 100644 --- a/chrome/sync_integration_tests.isolate +++ b/chrome/sync_integration_tests.isolate @@ -12,13 +12,8 @@ '<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_tracked': [ - '../net/tools/testserver/', '../testing/test_env.py', '../testing/xvfb.py', - '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py', - '../third_party/pywebsocket/src/mod_pywebsocket/', - '../third_party/tlslite/tlslite/', - '../tools/swarm_client/run_test_cases.py', '<(PRODUCT_DIR)/chrome.pak', '<(PRODUCT_DIR)/chrome_100_percent.pak', '<(PRODUCT_DIR)/libffmpegsumo.so', @@ -27,19 +22,47 @@ '<(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)', + ], + }, + }], + ['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', + ], + 'isolate_dependency_untracked': [ + '<(PRODUCT_DIR)/Chromium Framework.framework/', + '<(PRODUCT_DIR)/Chromium.app/', + ], + }, + }], + ['OS=="win"', { + 'variables': { + }, + }, { + 'variables': { + 'isolate_dependency_tracked': [ + '../net/tools/testserver/', + '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py', + '../third_party/pywebsocket/src/mod_pywebsocket/', + '../third_party/tlslite/tlslite/', + '../tools/swarm_client/run_test_cases.py', '<(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)', - '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], 'isolate_dependency_untracked': [ '../third_party/pywebsocket/src/mod_pywebsocket/handshake/', ], 'isolate_dependency_touched': [ '../third_party/pyftpdlib/src/pyftpdlib/__init__.py', - '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', ], }, }], -- cgit v1.1