diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 14:43:50 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 14:43:50 +0000 |
| commit | fcd1e76a3a11630b22f8fe413a8968590df3849e (patch) | |
| tree | 1096c41d3f681a0494ad34eb3287da41aefaa935 /net/net.gyp | |
| parent | f54c5e09eb6ac73bae1bf52a3415fecd217a7a90 (diff) | |
| download | chromium_src-fcd1e76a3a11630b22f8fe413a8968590df3849e.zip chromium_src-fcd1e76a3a11630b22f8fe413a8968590df3849e.tar.gz chromium_src-fcd1e76a3a11630b22f8fe413a8968590df3849e.tar.bz2 | |
Move net_unittests and net_unittests_run inside a inside_chromium_build==1 condition.
WebKit doesn't checkout all the necessary dependencies to be able to run
net_unittests successfully. Since this test was never run on the
build.webkit.org builders, this was never observed.
There is no reason to even build this target since it wouldn't pass anyway. So
move the 2 targets inside the inside_chromium_build==1 condition.
This will turn the Chromium Win Release builder back green.
R=rsleevi@chromium.org
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10698126
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 75 |
1 files changed, 41 insertions, 34 deletions
diff --git a/net/net.gyp b/net/net.gyp index 73c7fd4..48fd6b3 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1287,8 +1287,8 @@ 'conditions': [ ['chromeos==1', { 'sources!': [ - 'base/network_change_notifier_linux_unittest.cc', - 'proxy/proxy_config_service_linux_unittest.cc', + 'base/network_change_notifier_linux_unittest.cc', + 'proxy/proxy_config_service_linux_unittest.cc', ], }], [ 'use_glib == 1', { @@ -1395,38 +1395,6 @@ ], }, { - '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', - ], - }, - ], - }, - { 'target_name': 'net_perftests', 'type': 'executable', 'dependencies': [ @@ -1746,6 +1714,45 @@ }, ], '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': [ { |