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

Unified Diff: base/base.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 | « no previous file | build/all.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index bab45b878e59b692690dfbba3a4e90b9a9db64e2..12248056545b8fd7e17f3c3e7ae800a36ebd4815 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -732,38 +732,6 @@
],
},
{
- 'target_name': 'base_unittests_run',
- 'type': 'none',
- 'dependencies': [
- 'base_unittests',
- ],
- 'includes': [
- 'base_unittests.isolate',
- ],
- 'actions': [
- {
- 'action_name': 'isolate',
- 'inputs': [
- 'base_unittests.isolate',
- '<@(isolate_dependency_tracked)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/base_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', 'base_unittests.isolate',
- ],
- },
- ],
- },
- {
'target_name': 'test_support_perf',
'type': 'static_library',
'dependencies': [
@@ -1022,5 +990,41 @@
},
],
}],
+ ['test_isolation_mode != "noop"', {
+ 'targets': [
+ {
+ 'target_name': 'base_unittests_run',
+ 'type': 'none',
+ 'dependencies': [
+ 'base_unittests',
+ ],
+ 'includes': [
+ 'base_unittests.isolate',
+ ],
+ 'actions': [
+ {
+ 'action_name': 'isolate',
+ 'inputs': [
+ 'base_unittests.isolate',
+ '<@(isolate_dependency_tracked)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/base_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', 'base_unittests.isolate',
+ ],
+ },
+ ],
+ },
+ ],
+ }],
],
}
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698