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

Unified Diff: third_party/tcmalloc/vendor/src/tests/debugallocation_test.cc

Issue 7430002: Update the tcmalloc vendor branch to r111 (perftools version 1.8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/vendor/src/tests/debugallocation_test.cc
===================================================================
--- third_party/tcmalloc/vendor/src/tests/debugallocation_test.cc (revision 92996)
+++ third_party/tcmalloc/vendor/src/tests/debugallocation_test.cc (working copy)
@@ -75,7 +75,10 @@
// This flag won't be compiled in in opt mode.
DECLARE_int32(max_free_queue_size);
-// Test match as well as mismatch rules:
+// Test match as well as mismatch rules. But do not test on OS X; on
+// OS X the OS converts new/new[] to malloc before it gets to us, so
+// we are unable to catch these mismatch errors.
+#ifndef __APPLE__
TEST(DebugAllocationTest, DeallocMismatch) {
// malloc can be matched only by free
// new can be matched only by delete and delete(nothrow)
@@ -132,6 +135,7 @@
::operator delete[](y, std::nothrow);
}
}
+#endif // #ifdef OS_MACOSX
TEST(DebugAllocationTest, DoubleFree) {
int* pint = new int;
« no previous file with comments | « third_party/tcmalloc/vendor/src/tcmalloc.cc ('k') | third_party/tcmalloc/vendor/src/tests/malloc_extension_c_test.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698