Add another possible output.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3783

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 1f35fa1d504839d3ef0737d237e402a0129725f0..6b803bef608850bd1782cbddd5af7c8833d73940 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -34,7 +34,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        inline.stderr.exp inline.stdout.exp inline.vgtest \
        leak-0.vgtest leak-0.stderr.exp \
        leak-cycle.vgtest leak-cycle.stderr.exp leak-cycle.stderr.exp64 \
-       leak-tree.vgtest leak-tree.stderr.exp leak-tree.stderr.exp64 \
+       leak-tree.vgtest leak-tree.stderr.exp \
+       leak-tree.stderr.exp2 leak-tree.stderr.exp64 \
        leak-regroot.vgtest leak-regroot.stderr.exp \
        leakotron.vgtest leakotron.stdout.exp leakotron.stderr.exp \
        malloc1.stderr.exp malloc1.vgtest \

diff --git a/memcheck/tests/leak-tree.stderr.exp2 b/memcheck/tests/leak-tree.stderr.exp2
new file mode 100644 (file)
index 0000000..cebd430
--- /dev/null
+++ b/memcheck/tests/leak-tree.stderr.exp2
@@ -0,0 +1,51 @@
+
+searching for pointers to 11 not-freed blocks.
+checked ... bytes.
+
+8 bytes in 1 blocks are definitely lost in loss record 1 of 11
+   at 0x........: malloc (vg_replace_malloc.c:...)
+   by 0x........: mk (leak-tree.c:11)
+   by 0x........: main (leak-tree.c:25)
+
+LEAK SUMMARY:
+   definitely lost: 8 bytes in 1 blocks.
+     possibly lost: 0 bytes in 0 blocks.
+   still reachable: 80 bytes in 10 blocks.
+        suppressed: 0 bytes in 0 blocks.
+Reachable blocks (those to which a pointer was found) are not shown.
+To see them, rerun with: --show-reachable=yes
+searching for pointers to 14 not-freed blocks.
+checked ... bytes.
+
+
+8 bytes in 1 blocks are definitely lost in loss record 1 of 14
+   at 0x........: malloc (vg_replace_malloc.c:...)
+   by 0x........: mk (leak-tree.c:11)
+   by 0x........: main (leak-tree.c:39)
+
+
+8 bytes in 1 blocks are definitely lost in loss record 2 of 14
+   at 0x........: malloc (vg_replace_malloc.c:...)
+   by 0x........: mk (leak-tree.c:11)
+   by 0x........: main (leak-tree.c:38)
+
+
+40 (8 direct, 32 indirect) bytes in 1 blocks are definitely lost in loss record 14 of 14
+   at 0x........: malloc (vg_replace_malloc.c:...)
+   by 0x........: mk (leak-tree.c:11)
+   by 0x........: main (leak-tree.c:25)
+
+LEAK SUMMARY:
+   definitely lost: 24 bytes in 3 blocks.
+   indirectly lost: 32 bytes in 4 blocks.
+     possibly lost: 0 bytes in 0 blocks.
+   still reachable: 56 bytes in 7 blocks.
+        suppressed: 0 bytes in 0 blocks.
+Reachable blocks (those to which a pointer was found) are not shown.
+To see them, rerun with: --show-reachable=yes
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+malloc/free: in use at exit: 112 bytes in 14 blocks.
+malloc/free: 14 allocs, 0 frees, 112 bytes allocated.
+For a detailed leak analysis,  rerun with: --leak-check=yes
+For counts of detected errors, rerun with: -v