fix 308321 testsuite memcheck filter interferes with gdb_filter

Patch from Mark Wielaard.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13043 a5019735-40e9-0310-863c-91ae7b9d1cf9

diff --git a/NEWS b/NEWS
index 81d00314b1f5061298c20165860dc877dfa7953b..0271eca42a11b3faa877aa3d274b3cad1916463f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,7 @@ m = merged into 3_8_BRANCH
 305948    [390] ppc64: code generation for ShlD64 / ShrD64 asserts
 306054    [390] s390x: Condition code computation for convert-to-int/logical
 307155    [390] filter_gdb should filter out syscall-template.S T_PSEUDO
+308321    [390] testsuite memcheck filter interferes with gdb_filter 
 n-i-bz    [390] report error for vgdb snapshot requested before execution
 n-i-bz    [390] Some wrong command line options could be ignored
 

diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb
index 479fd0c454161d53731d86aca280d6475db8bf3e..d956d94e84cc7977888dcc9c43d4911057893ad7 100755 (executable)
--- a/gdbserver_tests/filter_gdb
+++ b/gdbserver_tests/filter_gdb
@@ -12,6 +12,8 @@ $dir/../tests/filter_addresses                                      |
 # memcheck stuff
 $dir/filter_memcheck_monitor "$@"                                   |
 
+# memcheck filter might leave some "..." lines, we are not interested
+sed -e '/^\ \ \ \ \.\.\.$/d'                                        |
 
 # Anonymise or remove :
 #       delete the initial lines between the launch of vgdb and the