Change filter_memcheck_monitor as glibc 2.27 seems to keep some more memory

There is no real need to verify how much memory is still in use at
exit, so filter this in filter_memcheck_monitor.

Analysis by Dimitrije Nikolic

diff --git a/gdbserver_tests/filter_memcheck_monitor b/gdbserver_tests/filter_memcheck_monitor
index 431352b22262ad6e90a28ef8289987a5e9872810..f5a2e51eee2a17993976336c2b6ca61dc57bc0e7 100755 (executable)
--- a/gdbserver_tests/filter_memcheck_monitor
+++ b/gdbserver_tests/filter_memcheck_monitor
@@ -31,4 +31,5 @@ sed -e '/Cannot access memory at address 0x......../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/in use at exit: [0-9][0-9]* bytes in [0-9][0-9]* blocks/in use at exit: ... bytes in ... blocks/' \
     -e '/^  total heap usage: /d'

diff --git a/gdbserver_tests/mcclean_after_fork.stderr.exp b/gdbserver_tests/mcclean_after_fork.stderr.exp
index 3bb7944e1f2d38135b4793eb2c09b4baab228e5d..91071826bb66a24293974b7772f20b48a30dc5b6 100644 (file)
--- a/gdbserver_tests/mcclean_after_fork.stderr.exp
+++ b/gdbserver_tests/mcclean_after_fork.stderr.exp
@@ -1,6 +1,6 @@
 (action at startup) vgdb me ... 
 HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
+    in use at exit: ... bytes in ... blocks
 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 d82a7ee7cb691dcacd99b53e4ccbee23a3344d2d..546bc3711488bfe811aa4b3e99767a2e354627a8 100644 (file)
--- a/gdbserver_tests/mcmain_pic.stderr.exp
+++ b/gdbserver_tests/mcmain_pic.stderr.exp
@@ -1,6 +1,6 @@
 (action at startup) vgdb me ... 
 HEAP SUMMARY:
-    in use at exit: 16 bytes in 1 blocks
+    in use at exit: ... bytes in ... blocks
 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 7dbc9ee16468ff1dfc012c20188c07822d902caf..4055b97ec5629545534f097009e105460ed660d6 100644 (file)
--- a/gdbserver_tests/mcsignopass.stderr.exp
+++ b/gdbserver_tests/mcsignopass.stderr.exp
@@ -8,7 +8,7 @@ Test 2:   PASS
 Test 3:   PASS
 Test 4:   PASS
 HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
+    in use at exit: ... bytes in ... blocks
 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 7a754fd0cf0afc5613d92123acc0e54274c1ba45..e35e38a4ab11ea3aca0ccd8695017447c73980e5 100644 (file)
--- a/gdbserver_tests/mcsigpass.stderr.exp
+++ b/gdbserver_tests/mcsigpass.stderr.exp
@@ -8,7 +8,7 @@ Test 2:   PASS
 Test 3:   PASS
 Test 4:   PASS
 HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
+    in use at exit: ... bytes in ... blocks
 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 319547c917de294b07c6b5f9d90d3a9e5c0e93e3..8d04da054cc9e54a00c1c056e6aa906a6ab159d9 100644 (file)
--- a/gdbserver_tests/mcwatchpoints.stderr.exp
+++ b/gdbserver_tests/mcwatchpoints.stderr.exp
@@ -15,7 +15,7 @@ before rewriting 8
 value 0nde4ine8
 value of k50[1000] p
 HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
+    in use at exit: ... bytes in ... blocks
 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)