Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Unified Diff: net/net.gyp

Issue 10019014: Convert isolate.py to exclusively use .isolate files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reduce copy pasted constants Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 15690c03c03f4e35404c8e4ab4421ed2b3a2634d..786d50f322e202af513ee4621a88514361e09b92 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1382,39 +1382,14 @@
'dependencies': [
'net_unittests',
],
+ 'includes': [
+ 'net_unittests.isolate',
+ ],
'actions': [
{
- 'action_name': 'response_file',
- 'inputs': [
- '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
- '<(DEPTH)/testing/test_env.py',
- '<(DEPTH)/testing/xvfb.py',
- '<(DEPTH)/third_party/pyftpdlib/src/pyftpdlib/__init__.py',
- '<(DEPTH)/third_party/pyftpdlib/src/pyftpdlib/ftpserver.py',
- ],
- 'conditions': [
- ['OS=="linux"', {
- 'inputs': [
- '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
- ],
- }],
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/net_unittests.inputs',
- ],
- 'action': [
- 'python',
- '-c',
- 'import sys; '
- 'open(sys.argv[1], \'w\').write(\'\\n\'.join(sys.argv[2:]))',
- '<@(_outputs)',
- '<@(_inputs)',
- ],
- },
- {
'action_name': 'isolate',
'inputs': [
- '<(PRODUCT_DIR)/net_unittests.inputs',
+ '<@(isolate_dependency_tracked)',
],
'outputs': [
'<(PRODUCT_DIR)/net_unittests.results',
@@ -1422,23 +1397,12 @@
'action': [
'python',
'<(DEPTH)/tools/isolate/isolate.py',
- '--mode=<(tests_run)',
- '--root', '<(DEPTH)',
+ '--mode', '<(tests_run)',
+ '--variable', 'DEPTH=<(DEPTH)',
+ '--variable', 'PRODUCT_DIR=<(PRODUCT_DIR)',
+ '--variable', 'OS=<(OS)',
'--result', '<@(_outputs)',
- '--files', '<@(_inputs)',
- # Directories can't be tracked by build tools (make, msbuild, xcode,
- # etc) so we just put it on the command line without specifying it
- # as an input.
- # TODO(maruel): Revisit the support for this at all and list each
- # individual test files instead.
- 'data/',
- 'tools/testserver/',
- '<(DEPTH)/third_party/tlslite/tlslite/',
- '--',
- # Wraps net_unittests under xvfb.
- '<(DEPTH)/testing/xvfb.py',
- '<(PRODUCT_DIR)',
- '<(PRODUCT_DIR)/net_unittests<(EXECUTABLE_SUFFIX)',
+ 'net_unittests.isolate',
],
},
],
« no previous file with comments | « base/base_unittests.isolate ('k') | net/net_unittests.isolate » ('j') | tools/isolate/isolate.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698