diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 13:53:57 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 13:53:57 +0000 |
| commit | 3a8b8381b72a83760c3d80ef5c3df7eda4b3ee30 (patch) | |
| tree | 9600619e6426737232b766707ea0270b4775fd8b /base/test | |
| parent | cce15bbb3299234c61d0799db32fc56f572babb4 (diff) | |
| download | chromium_src-3a8b8381b72a83760c3d80ef5c3df7eda4b3ee30.zip chromium_src-3a8b8381b72a83760c3d80ef5c3df7eda4b3ee30.tar.gz chromium_src-3a8b8381b72a83760c3d80ef5c3df7eda4b3ee30.tar.bz2 | |
Speculatively increase test timeouts under MSan.
Looks like a 2x multiplier might not be enough for browser_tests. Let's try 3x.
We'll probably want to do the same for TSan once we start running browser_tests
under TSan.
BUG=178409
TBR=phajdan.jr@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/344433002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
| -rw-r--r-- | base/test/test_timeouts.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc index 34a0902..b491b99 100644 --- a/base/test/test_timeouts.cc +++ b/base/test/test_timeouts.cc @@ -16,8 +16,10 @@ namespace { // ASan/TSan/MSan instrument each memory access. This may slow the execution // down significantly. -#if defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || \ - defined(SYZYASAN) || defined(MEMORY_SANITIZER) +#if defined(MEMORY_SANITIZER) +static const int kTimeoutMultiplier = 3; +#elif defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || \ + defined(SYZYASAN) static const int kTimeoutMultiplier = 2; #else static const int kTimeoutMultiplier = 1; |