Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Side by Side Diff: base/test/test_timeouts.cc

Issue 413133005: MSan: increase the test timeout multiplier to 4x. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/test/test_timeouts.h" 5 #include "base/test/test_timeouts.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/test/test_switches.h" 13 #include "base/test/test_switches.h"
14 14
15 namespace { 15 namespace {
16 16
17 // ASan/TSan/MSan instrument each memory access. This may slow the execution 17 // ASan/TSan/MSan instrument each memory access. This may slow the execution
18 // down significantly. 18 // down significantly.
19 #if defined(MEMORY_SANITIZER) 19 #if defined(MEMORY_SANITIZER)
20 static const int kTimeoutMultiplier = 3; 20 static const int kTimeoutMultiplier = 4;
21 #elif defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || \ 21 #elif defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || \
22 defined(SYZYASAN) 22 defined(SYZYASAN)
23 static const int kTimeoutMultiplier = 2; 23 static const int kTimeoutMultiplier = 2;
24 #else 24 #else
25 static const int kTimeoutMultiplier = 1; 25 static const int kTimeoutMultiplier = 1;
26 #endif 26 #endif
27 27
28 const int kAlmostInfiniteTimeoutMs = 100000000; 28 const int kAlmostInfiniteTimeoutMs = 100000000;
29 29
30 // Sets value to the greatest of: 30 // Sets value to the greatest of:
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_, 102 InitializeTimeout(switches::kTestLauncherTimeout, action_timeout_ms_,
103 &test_launcher_timeout_ms_); 103 &test_launcher_timeout_ms_);
104 104
105 // The timeout values should be increasing in the right order. 105 // The timeout values should be increasing in the right order.
106 CHECK(tiny_timeout_ms_ <= action_timeout_ms_); 106 CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
107 CHECK(action_timeout_ms_ <= action_max_timeout_ms_); 107 CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
108 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_); 108 CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
109 109
110 CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_); 110 CHECK(action_timeout_ms_ <= test_launcher_timeout_ms_);
111 } 111 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698