| Index: base/test/test_timeouts.cc
|
| diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
|
| index 34a0902765ca10d39698083b130a9f9bf7f40f4b..b491b993a03c6bfa39b667bafc3f167d0dca1d0e 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;
|
|
|