summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorglotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-04 13:15:28 +0000
committerglotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-04 13:15:28 +0000
commite5135dacf5f631d44c1e041f8bd64b6fa75d2c93 (patch)
treebb92fe7f9399f959950435db05e1a1758ff5ecfd
parent62a15bd10eca46c1e528d7d15fd156074636d9a4 (diff)
downloadchromium_src-e5135dacf5f631d44c1e041f8bd64b6fa75d2c93.zip
chromium_src-e5135dacf5f631d44c1e041f8bd64b6fa75d2c93.tar.gz
chromium_src-e5135dacf5f631d44c1e041f8bd64b6fa75d2c93.tar.bz2
Reverting Temporal increase of test timeouts for ASAN image.
FYI: http://codereview.chromium.org/10449086/ BUG=chromium-os:24567 TEST=unit Review URL: https://chromiumcodereview.appspot.com/10477012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140278 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/test/test_timeouts.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 163ed6e..dc7f243 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -12,7 +12,7 @@
namespace {
#ifdef ADDRESS_SANITIZER
-static const int kTimeoutMultiplier = 6;
+static const int kTimeoutMultiplier = 2;
#else
static const int kTimeoutMultiplier = 1;
#endif