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

Unified Diff: base/threading/thread_unittest.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/test/test_timeouts.cc ('k') | base/tracked_objects.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/threading/thread_unittest.cc
diff --git a/base/threading/thread_unittest.cc b/base/threading/thread_unittest.cc
index f3fb3343e9a360c70108cfa7cce11e57f773a9ae..f4d024f1a26a79fb53ac599ff5ba3c8202727da8 100644
--- a/base/threading/thread_unittest.cc
+++ b/base/threading/thread_unittest.cc
@@ -133,7 +133,12 @@ TEST_F(ThreadTest, StartWithOptions_StackSize) {
// Ensure that the thread can work with only 12 kb and still process a
// message.
Thread::Options options;
+#if defined(ADDRESS_SANITIZER) && defined(OS_MACOSX)
+ // ASan bloats the stack variables and overflows the 12 kb stack on OSX.
+ options.stack_size = 24*1024;
+#else
options.stack_size = 12*1024;
+#endif
EXPECT_TRUE(a.StartWithOptions(options));
EXPECT_TRUE(a.message_loop());
EXPECT_TRUE(a.IsRunning());
« no previous file with comments | « base/test/test_timeouts.cc ('k') | base/tracked_objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698