summaryrefslogtreecommitdiffstats
path: root/chrome/sync_integration_tests.isolate
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 14:01:52 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 14:01:52 +0000
commit10d0f0ea95af43e7cd6575cc99bab1e9d2fbc546 (patch)
tree0192d7bf052992426c728c8b9e95400368272a9d /chrome/sync_integration_tests.isolate
parentc1d25677c2cf840ca33733f8712b2b95fed59235 (diff)
downloadchromium_src-10d0f0ea95af43e7cd6575cc99bab1e9d2fbc546.zip
chromium_src-10d0f0ea95af43e7cd6575cc99bab1e9d2fbc546.tar.gz
chromium_src-10d0f0ea95af43e7cd6575cc99bab1e9d2fbc546.tar.bz2
Roll swarm_client @ 213621.
This moves run_test_cases.py into a subdirectory named googletest/ so the .isolate files had to be updated. $ git log $(git svn find-rev r212588)..$(git svn find-rev r213621) --format="%an %ai %s" | sed 's/\+0000 //' | sed 's/@chromium\.org//' maruel 2013-07-25 13:34:09 Move all googletest related scripts into googletest/ maruel 2013-07-24 15:54:29 Fix two layering violations between run_test_cases and non googletest tools. maruel 2013-07-24 13:04:30 Remove automatic copying fallback in run_isolated. maruel 2013-07-19 19:26:18 Remove references to vlan. TBR=csharp@chromium.org NOTRY=true BUG= Review URL: https://codereview.chromium.org/20104003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/sync_integration_tests.isolate')
-rw-r--r--chrome/sync_integration_tests.isolate9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 76cf74e..30fd0a5 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -8,7 +8,7 @@
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
- '../tools/swarm_client/run_test_cases.py',
+ '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [
@@ -44,8 +44,11 @@
}],
['OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
+ 'isolate_dependency_tracked': [
+ '../tools/swarm_client/run_isolated.py',
+ '../tools/swarm_client/googletest/run_test_cases.py',
+ ],
'isolate_dependency_untracked': [
- '../tools/swarm_client/',
'<(PRODUCT_DIR)/pyproto/',
],
},
@@ -53,7 +56,7 @@
['OS=="mac"', {
'variables': {
'command': [
- '../tools/swarm_client/run_test_cases.py',
+ '../tools/swarm_client/googletest/run_test_cases.py',
'<(PRODUCT_DIR)/sync_integration_tests<(EXECUTABLE_SUFFIX)',
],
'isolate_dependency_tracked': [