From: Mark Wielaard <mark@klomp.org>
Date: Mon, 19 Sep 2016 08:08:51 +0000 (+0000)
Subject: Fix bad gdbserver_tests heap usage tests stderr output.
X-Git-Tag: svn/VALGRIND_3_12_0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e588e2a8a4af50f5e12a997322b3dfc9840d3b2;p=thirdparty%2Fvalgrind.git

Fix bad gdbserver_tests heap usage tests stderr output.

When doing inferior function calls from gdb (in mcmain_pic) there might
be extra heap usage from gdb that we aren't interested in tracking.

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

diff --git a/gdbserver_tests/filter_memcheck_monitor b/gdbserver_tests/filter_memcheck_monitor
index fe6c405278..431352b222 100755
--- a/gdbserver_tests/filter_memcheck_monitor
+++ b/gdbserver_tests/filter_memcheck_monitor
@@ -22,8 +22,13 @@ $dir/filter_vgdb                                       |
 # Bypass a s390x kernel bug which makes faultstatus test3 fail. In our case, we are
 # not interested in checking the si_code, but rather the signal passing
 # in mcsig(no)pass
+#
+# When doing inferior function calls from gdb (in mcmain_pic) there might be
+# extra heap usage from gdb that we aren't interested in tracking.
+#
 sed -e '/Cannot access memory at address 0x......../d'                   \
     -e '/^[1-9][0-9]*	\.\.\/sysdeps\/powerpc\/powerpc32\/dl-start\.S: No such file or directory\./d' \
     -e '/^Missing separate debuginfo/d'                                  \
     -e '/^Try: zypper install -C/d'                                      \
-    -e 's/Test 3:   FAIL: expected si_code==2, not 128/Test 3:   PASS/'
+    -e 's/Test 3:   FAIL: expected si_code==2, not 128/Test 3:   PASS/'  \
+    -e '/^  total heap usage: /d'
diff --git a/gdbserver_tests/mcclean_after_fork.stderr.exp b/gdbserver_tests/mcclean_after_fork.stderr.exp
index b9a2ee2f1c..3bb7944e1f 100644
--- a/gdbserver_tests/mcclean_after_fork.stderr.exp
+++ b/gdbserver_tests/mcclean_after_fork.stderr.exp
@@ -1,7 +1,6 @@
 (action at startup) vgdb me ... 
 HEAP SUMMARY:
     in use at exit: 0 bytes in 0 blocks
-  total heap usage: 0 allocs, 0 frees, 0 bytes allocated
 For a detailed leak analysis, rerun with: --leak-check=full
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/gdbserver_tests/mcmain_pic.stderr.exp b/gdbserver_tests/mcmain_pic.stderr.exp
index 4e96ffce6a..d82a7ee7cb 100644
--- a/gdbserver_tests/mcmain_pic.stderr.exp
+++ b/gdbserver_tests/mcmain_pic.stderr.exp
@@ -1,7 +1,6 @@
 (action at startup) vgdb me ... 
 HEAP SUMMARY:
     in use at exit: 16 bytes in 1 blocks
-  total heap usage: 1 allocs, 0 frees, 16 bytes allocated
 For a detailed leak analysis, rerun with: --leak-check=full
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/gdbserver_tests/mcmain_pic.stderr.exp-solaris b/gdbserver_tests/mcmain_pic.stderr.exp-solaris
index cd16393196..56cc9bcd65 100644
--- a/gdbserver_tests/mcmain_pic.stderr.exp-solaris
+++ b/gdbserver_tests/mcmain_pic.stderr.exp-solaris
@@ -1,7 +1,6 @@
 (action at startup) vgdb me ... 
 HEAP SUMMARY:
     in use at exit: 131,080 bytes in 1 blocks
-  total heap usage: 1 allocs, 0 frees, 131,080 bytes allocated
 For a detailed leak analysis, rerun with: --leak-check=full
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/gdbserver_tests/mcsignopass.stderr.exp b/gdbserver_tests/mcsignopass.stderr.exp
index 7b0a80e5ef..7dbc9ee164 100644
--- a/gdbserver_tests/mcsignopass.stderr.exp
+++ b/gdbserver_tests/mcsignopass.stderr.exp
@@ -9,7 +9,6 @@ Test 3:   PASS
 Test 4:   PASS
 HEAP SUMMARY:
     in use at exit: 0 bytes in 0 blocks
-  total heap usage: 0 allocs, 0 frees, 0 bytes allocated
 For a detailed leak analysis, rerun with: --leak-check=full
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 11 errors from 1 contexts (suppressed: 0 from 0)
diff --git a/gdbserver_tests/mcsigpass.stderr.exp b/gdbserver_tests/mcsigpass.stderr.exp
index bd67a7ec90..7a754fd0cf 100644
--- a/gdbserver_tests/mcsigpass.stderr.exp
+++ b/gdbserver_tests/mcsigpass.stderr.exp
@@ -9,7 +9,6 @@ Test 3:   PASS
 Test 4:   PASS
 HEAP SUMMARY:
     in use at exit: 0 bytes in 0 blocks
-  total heap usage: 0 allocs, 0 frees, 0 bytes allocated
 For a detailed leak analysis, rerun with: --leak-check=full
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
diff --git a/gdbserver_tests/mcwatchpoints.stderr.exp b/gdbserver_tests/mcwatchpoints.stderr.exp
index afb594c023..319547c917 100644
--- a/gdbserver_tests/mcwatchpoints.stderr.exp
+++ b/gdbserver_tests/mcwatchpoints.stderr.exp
@@ -16,7 +16,6 @@ value 0nde4ine8
 value of k50[1000] p
 HEAP SUMMARY:
     in use at exit: 0 bytes in 0 blocks
-  total heap usage: 1 allocs, 1 frees, 50,000 bytes allocated
 For a detailed leak analysis, rerun with: --leak-check=full
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)