diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 06:46:59 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 06:46:59 +0000 |
| commit | 5f38d719c386c354b118224999c710a6fe22f92e (patch) | |
| tree | e4e41fa80a92b0fafdaa8f51412ff3eefa005675 /net/net.gyp | |
| parent | a4dd2973445111a54aebba41a3774761d8d16b67 (diff) | |
| download | chromium_src-5f38d719c386c354b118224999c710a6fe22f92e.zip chromium_src-5f38d719c386c354b118224999c710a6fe22f92e.tar.gz chromium_src-5f38d719c386c354b118224999c710a6fe22f92e.tar.bz2 | |
GTTF: Implement a timeout for TestServer on POSIX.
This will prevent tests from hanging when the test server fails to start.
BUG=60082
TEST=none
Review URL: http://codereview.chromium.org/4075003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/net.gyp b/net/net.gyp index 4a2db1b..6e7ef98 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -800,7 +800,6 @@ 'net_test_support', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/zlib/zlib.gyp:zlib', @@ -1059,7 +1058,6 @@ 'net_test_support', '../base/base.gyp:base', '../base/base.gyp:base_i18n', - '../base/base.gyp:test_support_base', '../base/base.gyp:test_support_perf', '../testing/gtest.gyp:gtest', ], @@ -1138,6 +1136,7 @@ 'dependencies': [ 'net', '../base/base.gyp:base', + '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', ], 'sources': [ |