diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 16:14:24 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 16:14:24 +0000 |
| commit | c1f323fb9c6c66ae73ca887f55a3e1d3392ec77b (patch) | |
| tree | e3eddf619112c391da1282a290c5c5e203687f15 /base | |
| parent | 0b30017682c81cf1b9f86889099f093d15b20f9c (diff) | |
| download | chromium_src-c1f323fb9c6c66ae73ca887f55a3e1d3392ec77b.zip chromium_src-c1f323fb9c6c66ae73ca887f55a3e1d3392ec77b.tar.gz chromium_src-c1f323fb9c6c66ae73ca887f55a3e1d3392ec77b.tar.bz2 | |
Increase the test timeout for ProcessUtilTest.FDRemapping under compiler-based ThreadSanitizer (http://dev.chromium.org/developers/testing/threadsanitizer-tsan-v2)
BUG=128314
Review URL: https://codereview.chromium.org/10949021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 7840ce3..f729c1a 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -594,7 +594,12 @@ int ProcessUtilTest::CountOpenFDsInChild() { HANDLE_EINTR(read(fds[0], &num_open_files, sizeof(num_open_files))); CHECK_EQ(bytes_read, static_cast<ssize_t>(sizeof(num_open_files))); +#if defined(THREAD_SANITIZER) + // Compiler-based ThreadSanitizer makes this test slow. + CHECK(base::WaitForSingleProcess(handle, base::TimeDelta::FromSeconds(3))); +#else CHECK(base::WaitForSingleProcess(handle, base::TimeDelta::FromSeconds(1))); +#endif base::CloseProcessHandle(handle); ret = HANDLE_EINTR(close(fds[0])); DPCHECK(ret == 0); |