summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 12:56:51 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 12:56:51 +0000
commitf6eea35109cac8825afc9e43eda641c0ca7b74a8 (patch)
tree27f282a3a208ab71a57380ca43ea61c83855c827 /base
parentd07e6be757545e96c0aea4f786a5485dae4197cc (diff)
downloadchromium_src-f6eea35109cac8825afc9e43eda641c0ca7b74a8.zip
chromium_src-f6eea35109cac8825afc9e43eda641c0ca7b74a8.tar.gz
chromium_src-f6eea35109cac8825afc9e43eda641c0ca7b74a8.tar.bz2
Double the timeout values when running under ThreadSanitizer v2. It is at least as slow as AddressSanitizer, if not worse.
BUG=128314 Review URL: https://codereview.chromium.org/14352009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/test/test_timeouts.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 2c9e7de..e8e4153 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -11,7 +11,9 @@
namespace {
-#ifdef ADDRESS_SANITIZER
+// ASan and TSan instrument each memory access. This may slow the execution
+// down significantly.
+#if defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER)
static const int kTimeoutMultiplier = 2;
#else
static const int kTimeoutMultiplier = 1;