summaryrefslogtreecommitdiffstats
path: root/build/isolate.gypi
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 22:59:35 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 22:59:35 +0000
commitbe84b56c274a82890ee51cc7dc87298c79a95fca (patch)
tree3bef856d61ed6e704099558142dabba495c4e0a6 /build/isolate.gypi
parent45f93cb92b530646f49e4419ad5a51c3528019ba (diff)
downloadchromium_src-be84b56c274a82890ee51cc7dc87298c79a95fca.zip
chromium_src-be84b56c274a82890ee51cc7dc87298c79a95fca.tar.gz
chromium_src-be84b56c274a82890ee51cc7dc87298c79a95fca.tar.bz2
Roll swarm_client @ 9fc05789e3.
Includes revert of r240243. $ git log aab3a62beb..9fc05789e3 --date=short --format="%ad %ae %s" | sed 's/@chromium\.org//' 2013-12-11 ganetsky Create a .gitignore file and add *.pyc to it 2013-12-11 maruel Stop signalling swarming error on Windows file locking. 2013-12-11 maruel Ensure variables are decoded to unicode. 2013-12-06 maruel Rename --command-variable to --extra-variables. 2013-12-06 maruel Add real variable support and split --variable in 3 different flags. 2013-12-05 vadimsh Add 'offset' parameter to StorageApi.fetch(...) method. 2013-12-05 maruel Change log message to be clearer. 2013-12-05 vadimsh Support custom HTTP headers in net.url_open. 2013-12-03 vadimsh Remove urllib2 support. 2013-12-03 vadimsh Wait for Storage's internal threads to finish before exiting. 2013-12-03 vadimsh Fix swarming_smoke_test.py and isolateserver_test.py. R=vadimsh@chromium.org NOTRY=true BUG= Review URL: https://codereview.chromium.org/113553003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/isolate.gypi')
-rw-r--r--build/isolate.gypi12
1 files changed, 8 insertions, 4 deletions
diff --git a/build/isolate.gypi b/build/isolate.gypi
index d1dd1a7..2c667de 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -33,6 +33,9 @@
#
# The generated .isolated file will be:
# <(PRODUCT_DIR)/foo_test.isolated
+#
+# See http://dev.chromium.org/developers/testing/isolated-testing/for-swes
+# for more information.
{
'rules': [
@@ -43,7 +46,6 @@
# Files that are known to be involved in this step.
'<(DEPTH)/tools/swarming_client/isolate.py',
'<(DEPTH)/tools/swarming_client/run_isolated.py',
- '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py',
# Disable file tracking by the build driver for now. This means the
# project must have the proper build-time dependency for their runtime
@@ -66,8 +68,8 @@
'<(test_isolation_mode)',
# Variables should use the -V FOO=<(FOO) form so frequent values,
# like '0' or '1', aren't stripped out by GYP.
- '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
- '--variable', 'OS=<(OS)',
+ '--path-variable', 'PRODUCT_DIR', '<(PRODUCT_DIR) ',
+ '--config-variable', 'OS=<(OS)',
'--result', '<@(_outputs)',
'--isolate', '<(RULE_INPUT_PATH)',
],
@@ -76,7 +78,9 @@
['OS=="mac"', {
# <(mac_product_name) can contain a space, so don't use FOO=<(FOO)
# form.
- 'action': [ '--variable', 'mac_product_name', '<(mac_product_name)' ],
+ 'action': [
+ '--extra-variable', 'mac_product_name', '<(mac_product_name)',
+ ],
}],
["test_isolation_outdir==''", {
# GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot