| 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',
|
| + ],
|
| + },
|
| + ],
|
| + },
|
| + ],
|
| + }],
|
| ],
|
| }
|
|
|