summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-01 16:31:34 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-01 16:31:34 +0000
commit8c4f2ed8a2a95afcd6e059fe2faee35d36961a16 (patch)
treeb027bde4248e3dfe1dcce0b97798b4141a8ee648 /tools
parent13935ed83f01a52144b89f9c9cae417589e07024 (diff)
downloadchromium_src-8c4f2ed8a2a95afcd6e059fe2faee35d36961a16.zip
chromium_src-8c4f2ed8a2a95afcd6e059fe2faee35d36961a16.tar.gz
chromium_src-8c4f2ed8a2a95afcd6e059fe2faee35d36961a16.tar.bz2
Change the heapchecker's stack line regexp to match both address output formats
used by tcmalloc (v1.4 vs. v1.5): "deadbeef" and "0xdeadbeef". Review URL: http://codereview.chromium.org/661279 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/heapcheck/heapcheck_test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/heapcheck/heapcheck_test.py b/tools/heapcheck/heapcheck_test.py
index 90f145df..42167a8 100644
--- a/tools/heapcheck/heapcheck_test.py
+++ b/tools/heapcheck/heapcheck_test.py
@@ -82,7 +82,7 @@ class HeapcheckWrapper(object):
"""
leak_report = re.compile(
'Leak of ([0-9]*) bytes in ([0-9]*) objects allocated from:')
- stack_line = re.compile('\s*@\s*[0-9a-fA-F]*\s*(\S*)')
+ stack_line = re.compile('\s*@\s*(?:0x)?[0-9a-fA-F]*\s*(\S*)')
return_code = 0
# leak signature: [number of bytes, number of objects]
cur_leak_signature = None