summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjdufault <jdufault@chromium.org>2015-07-24 15:26:26 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-24 22:27:54 +0000
commit494c8a9c316fcec9b170826dd60e5ec30f9c6c92 (patch)
tree25cb14c2d887db1c50abf99019ce4e87e5c3d6bd
parentb96612bf57906731ec9a640a59ea5336ff9c8037 (diff)
downloadchromium_src-494c8a9c316fcec9b170826dd60e5ec30f9c6c92.zip
chromium_src-494c8a9c316fcec9b170826dd60e5ec30f9c6c92.tar.gz
chromium_src-494c8a9c316fcec9b170826dd60e5ec30f9c6c92.tar.bz2
Increase test timeout on ASAN bots.
It will still occassionaly fail due to a timeout when running in an ASAN bot. BUG=465862 Review URL: https://codereview.chromium.org/1246203004 Cr-Commit-Position: refs/heads/master@{#340354}
-rw-r--r--ash/wm/lock_state_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc
index f87498f..c93f0d6 100644
--- a/ash/wm/lock_state_controller.cc
+++ b/ash/wm/lock_state_controller.cc
@@ -500,7 +500,7 @@ void LockStateController::PreLockAnimationFinished(bool request_lock) {
}
// Times out on ASAN bots.
#if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER)
- timeout *= 2;
+ timeout *= 4;
#endif
#endif
lock_fail_timer_.Start(