diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 14:51:06 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 14:51:06 +0000 |
| commit | ac6e94c893354e5fcfac3d9243600a7acddc5c86 (patch) | |
| tree | 9ca9185d316b2a948403f05985ad22900dc49d4c /base | |
| parent | 5e34a85823baeb7f6e7d63655e34f29c62c0b24f (diff) | |
| download | chromium_src-ac6e94c893354e5fcfac3d9243600a7acddc5c86.zip chromium_src-ac6e94c893354e5fcfac3d9243600a7acddc5c86.tar.gz chromium_src-ac6e94c893354e5fcfac3d9243600a7acddc5c86.tar.bz2 | |
Make the memory waterfall green -- more suppressions for bug 19775.
BUG=19775
TBR=tim
Review URL: http://codereview.chromium.org/2870016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/third_party/dynamic_annotations/dynamic_annotations.c | 2 | ||||
| -rw-r--r-- | base/tools_sanity_unittest.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/base/third_party/dynamic_annotations/dynamic_annotations.c b/base/third_party/dynamic_annotations/dynamic_annotations.c index 5cfadb9..b9cb58f 100644 --- a/base/third_party/dynamic_annotations/dynamic_annotations.c +++ b/base/third_party/dynamic_annotations/dynamic_annotations.c @@ -123,11 +123,13 @@ void AnnotateFlushState(const char *file, int line){} static int GetRunningOnValgrind(void) { #ifdef RUNNING_ON_VALGRIND + printf("RUNNING_ON_VALGRIND: %d\n", RUNNING_ON_VALGRIND); if (RUNNING_ON_VALGRIND) return 1; #endif #ifndef _MSC_VER char *running_on_valgrind_str = getenv("RUNNING_ON_VALGRIND"); + printf("env[RUNNING_ON_VALGRIND]=\"%s\"\n", running_on_valgrind_str); if (running_on_valgrind_str) { return strcmp(running_on_valgrind_str, "0") != 0; } diff --git a/base/tools_sanity_unittest.cc b/base/tools_sanity_unittest.cc index 3023059..10f1a72 100644 --- a/base/tools_sanity_unittest.cc +++ b/base/tools_sanity_unittest.cc @@ -75,7 +75,7 @@ TEST(ToolsSanityTest, AccessesToMallocMemory) { // This test may corrupt memory if not run under Valgrind. if (!RunningOnValgrind()) return; - + printf("HERE!\n"); char *foo = reinterpret_cast<char*>(malloc(10)); MakeSomeErrors(foo, 10); free(foo); |