From: Julian Seward <jseward@acm.org>
Date: Mon, 14 Feb 2011 14:42:25 +0000 (+0000)
Subject: Merge from trunk, r11510 (partial): update test's expected output.
X-Git-Tag: svn/VALGRIND_3_6_1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d5e3fee30491f9dfe73fe45166338d97524fb82;p=thirdparty%2Fvalgrind.git

Merge from trunk, r11510 (partial): update test's expected output.


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_6_BRANCH@11559
---

diff --git a/memcheck/tests/mempool.stderr.exp b/memcheck/tests/mempool.stderr.exp
index 8ca7f0625a..b2ab3b4b49 100644
--- a/memcheck/tests/mempool.stderr.exp
+++ b/memcheck/tests/mempool.stderr.exp
@@ -1,19 +1,17 @@
 Invalid write of size 1
    at 0x........: test (mempool.c:130)
    by 0x........: main (mempool.c:154)
- Address 0x........ is 7 bytes inside a block of size 100,000 alloc'd
-   at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: make_pool (mempool.c:44)
-   by 0x........: test (mempool.c:117)
+ Address 0x........ is 1 bytes before a block of size 10 client-defined
+   at 0x........: allocate (mempool.c:105)
+   by 0x........: test (mempool.c:121)
    by 0x........: main (mempool.c:154)
 
 Invalid write of size 1
    at 0x........: test (mempool.c:131)
    by 0x........: main (mempool.c:154)
- Address 0x........ is 18 bytes inside a block of size 100,000 alloc'd
-   at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: make_pool (mempool.c:44)
-   by 0x........: test (mempool.c:117)
+ Address 0x........ is 0 bytes after a block of size 10 client-defined
+   at 0x........: allocate (mempool.c:105)
+   by 0x........: test (mempool.c:121)
    by 0x........: main (mempool.c:154)
 
 Invalid write of size 1