diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 23:05:14 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-04 23:05:14 +0000 |
| commit | 40d0085e5a0bada6120c9ce8dbb9e4cb498af923 (patch) | |
| tree | 93abc79dae73600cedd06f4b9449e6445daaac60 /net/net_unittests.isolate | |
| parent | 01a53cee4479dcb2dbb9175822294459a44d07af (diff) | |
| download | chromium_src-40d0085e5a0bada6120c9ce8dbb9e4cb498af923.zip chromium_src-40d0085e5a0bada6120c9ce8dbb9e4cb498af923.tar.gz chromium_src-40d0085e5a0bada6120c9ce8dbb9e4cb498af923.tar.bz2 | |
Update all .isolate files to the new format.
Autogenerated with:
for a in $(git ls-files | grep \\.isolate); do tools/swarm_client/isolate_merge.py $a -o $a; done
content/content_browsertests.isolate failed to be converted automatically.
NOTRY=true
TBR=csharp@chromium.org
BUG=
Review URL: https://chromiumcodereview.appspot.com/13654003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_unittests.isolate')
| -rw-r--r-- | net/net_unittests.isolate | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate index 62799cb..a54c3f4 100644 --- a/net/net_unittests.isolate +++ b/net/net_unittests.isolate @@ -2,26 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { - 'variables': { - 'isolate_dependency_tracked': [ - '../chrome/test/data/animate1.gif', - '../chrome/test/data/server-unavailable.html', - '../chrome/test/data/server-unavailable.html.mock-http-headers', - '../chrome/test/data/simple.html', - '../testing/test_env.py', - '../tools/swarm_client/run_isolated.py', - '../tools/swarm_client/run_test_cases.py', - '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', - ], - 'isolate_dependency_untracked': [ - '../third_party/pywebsocket/', - '../third_party/tlslite/', - '../third_party/pyftpdlib/', - 'data/', - 'tools/testserver/', - '<(PRODUCT_DIR)/pyproto/', - ], - }, 'conditions': [ ['OS=="linux"', { 'variables': { @@ -36,7 +16,30 @@ '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', ], }, - }, { + }], + ['OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'isolate_dependency_tracked': [ + '../chrome/test/data/animate1.gif', + '../chrome/test/data/server-unavailable.html', + '../chrome/test/data/server-unavailable.html.mock-http-headers', + '../chrome/test/data/simple.html', + '../testing/test_env.py', + '../tools/swarm_client/run_isolated.py', + '../tools/swarm_client/run_test_cases.py', + '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', + ], + 'isolate_dependency_untracked': [ + '../third_party/pyftpdlib/', + '../third_party/pywebsocket/', + '../third_party/tlslite/', + '<(PRODUCT_DIR)/pyproto/', + 'data/', + 'tools/testserver/', + ], + }, + }], + ['OS=="mac" or OS=="win"', { 'variables': { 'command': [ '../testing/test_env.py', @@ -48,10 +51,10 @@ ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/icudt.dll', + '<(PRODUCT_DIR)/icudt.dll', ], 'isolate_dependency_untracked': [ - '../third_party/python_26/', + '../third_party/python_26/', ], }, }], |