Index: third_party/tcmalloc/chromium/src/tests/sampler_test.cc |
=================================================================== |
--- third_party/tcmalloc/chromium/src/tests/sampler_test.cc (revision 87277) |
+++ third_party/tcmalloc/chromium/src/tests/sampler_test.cc (working copy) |
@@ -87,7 +87,7 @@ |
char buf[256]; // should be big enough for all logging |
va_list ap; |
va_start(ap, format); |
- vsnprintf(buf, sizeof(buf), format, ap); |
+ perftools_vsnprintf(buf, sizeof(buf), format, ap); |
va_end(ap); |
return buf; |
} |
@@ -647,6 +647,11 @@ |
LOG(INFO) << "Size of Sampler object is: " << sizeof(sampler); |
} |
+// Make sure sampling is enabled, or the tests won't work right. |
+DECLARE_int64(tcmalloc_sample_parameter); |
+ |
int main(int argc, char **argv) { |
+ if (FLAGS_tcmalloc_sample_parameter == 0) |
+ FLAGS_tcmalloc_sample_parameter = 524288; |
return RUN_ALL_TESTS(); |
} |