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

Unified Diff: net/net.gyp

Issue 10828061: Remove target chromium_swarm_tests when test_isolate_mode == noop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index f8de4ffc7297fc4c6466973ade3a7fb19111cd53..8c34a60c3e61123a164984af5c6f3181c92ddf74 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1740,45 +1740,6 @@
},
],
'conditions': [
- ['inside_chromium_build==1', {
- 'targets': [
- # This target depends on dependencies not fetched by WebKit's DEPS.
- # In particular, ..\chrome\test\data and ..\third_party\python_26 on
- # Windows.
- {
- 'target_name': 'net_unittests_run',
- 'type': 'none',
- 'dependencies': [
- 'net_unittests',
- ],
- 'includes': [
- 'net_unittests.isolate',
- ],
- 'actions': [
- {
- 'action_name': 'isolate',
- 'inputs': [
- 'net_unittests.isolate',
- '<@(isolate_dependency_tracked)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/net_unittests.results',
- ],
- 'action': [
- 'python',
- '../tools/isolate/isolate.py',
- '<(test_isolation_mode)',
- '--outdir', '<(test_isolation_outdir)',
- '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
- '--variable', 'OS', '<(OS)',
- '--result', '<@(_outputs)',
- '--isolate', 'net_unittests.isolate',
- ],
- },
- ],
- },
- ],
- }],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'targets': [
{
@@ -1981,5 +1942,41 @@
},
],
}],
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'net_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'net_unittests',
+ ],
+ 'includes': [
+ 'net_unittests.isolate',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'isolate',
+ 'inputs': [
+ 'net_unittests.isolate',
+ '<@(isolate_dependency_tracked)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/net_unittests.results',
+ ],
+ 'action': [
+ 'python',
+ '../tools/isolate/isolate.py',
+ '<(test_isolation_mode)',
+ '--outdir', '<(test_isolation_outdir)',
+ '--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
+ '--variable', 'OS', '<(OS)',
+ '--result', '<@(_outputs)',
+ '--isolate', 'net_unittests.isolate',
+ ],
+ },
+ ],
+ },
+ ],
+ }],
],
}
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698