diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 01:59:29 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 01:59:29 +0000 |
| commit | 256f4bd66fd000e2414495fc12c8d7a6152ab003 (patch) | |
| tree | 6a3454007015206edfd69f58e2fa3491c1fa0f73 /net/net_unittests.isolate | |
| parent | 5793906a89da44f153d3ec999544653fae5e58e1 (diff) | |
| download | chromium_src-256f4bd66fd000e2414495fc12c8d7a6152ab003.zip chromium_src-256f4bd66fd000e2414495fc12c8d7a6152ab003.tar.gz chromium_src-256f4bd66fd000e2414495fc12c8d7a6152ab003.tar.bz2 | |
Convert isolate.py to exclusively use .isolate files.
Convert base_unittests_run and net_unittests_run to use the new format.
Rename isolate_files to isolate_dependency_tracked and ..._dirs to ..._untracked.
Rewrite merge_isolate.py to have fully deterministic and sane behavior, especially for 'else' conditions.
Convert 'python' to sys.executable when running the command.
Add a lot of unit tests.
Move hashtable default directory into dirname(result) + '/hashtable'.
R=rogerta@chromium.org
R=mark@chromium.org
R=rsleevi@chromium.org
BUG=98834
TEST=
Review URL: http://codereview.chromium.org/10019014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_unittests.isolate')
| -rw-r--r-- | net/net_unittests.isolate | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate new file mode 100644 index 0000000..0fdbdaf --- /dev/null +++ b/net/net_unittests.isolate @@ -0,0 +1,46 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', + '../testing/test_env.py', + '../third_party/pyftpdlib/src/pyftpdlib/__init__.py', + '../third_party/pyftpdlib/src/pyftpdlib/ftpserver.py', + ], + 'isolate_dependency_untracked': [ + 'data/', + 'tools/testserver/', + '../third_party/tlslite/tlslite/', + ], + }, + 'conditions': [ + ['OS=="linux"', { + 'variables': { + 'isolate_dependency_tracked': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)', + ], + 'command': [ + '../testing/xvfb.py', + '<(PRODUCT_DIR)', + '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }, { # else + 'variables': { + 'command': [ + '../testing/test_env.py', + '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ['OS=="win"', { + 'variables': { + 'isolate_dependency_tracked': [ + ], + }, + }], + ], +} |