From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Thu, 24 Apr 2014 21:52:02 +0000 (+0000)
Subject: Too difficult to match the stacktrace of the last instruction
X-Git-Tag: svn/VALGRIND_3_10_0~530
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac230f7fcbfcba883e46e7cd74518de2fdf4695e;p=thirdparty%2Fvalgrind.git

Too difficult to match the stacktrace of the last instruction
of a program => let's remove these (uninteresting) lines
rather than trying to 'sed' them to make them look the same
on different OS/platform/....


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

diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb
index a31cb0f175..71463ab513 100755
--- a/gdbserver_tests/filter_gdb
+++ b/gdbserver_tests/filter_gdb
@@ -20,6 +20,8 @@ sed -e '/^\ \ \ \ \.\.\.$/d'                                        |
 #         output of the echo command telling it is launched.
 #         This removes a whole lot of uninteresting lines varying
 #         with OS/glibc/gdb dep
+#       then have a general way to delete uninteresting and vayring
+#         lines.
 #       initial tty control character sent by gdb 7.0
 #       remove missing debuginfos
 #       vgdb message
@@ -54,6 +56,7 @@ sed -e '/^\ \ \ \ \.\.\.$/d'                                        |
 #       'exited with code' and 'exited normally' are printed slightly
 #       differently between gdb versions, normalize to "Program exited...".
 sed -e '/Remote debugging using/,/vgdb launched process attached/d'                                   \
+    -e '/filter_gdb BEGIN drop/,/filter_gdb END drop/d'                                               \
     -e 's/^\[?1034hReading symbols/Reading symbols/'                                                \
     -e '/^Missing separate debuginfo/d'                                                               \
     -e '/^Try: zypper install -C/d'                                                                   \
diff --git a/gdbserver_tests/nlgone_exit.stdinB.gdb b/gdbserver_tests/nlgone_exit.stdinB.gdb
index 3724be6ec3..2ed6ed3eb4 100644
--- a/gdbserver_tests/nlgone_exit.stdinB.gdb
+++ b/gdbserver_tests/nlgone_exit.stdinB.gdb
@@ -2,7 +2,9 @@
 target remote | ./vgdb --wait=60 --vgdb-prefix=./vgdb-prefix-nlgone-exit
 echo vgdb launched process attached\n
 # continue after startup
+echo filter_gdb BEGIN drop\n
 continue
+echo filter_gdb END drop\n
 # continue at the last instruction
 continue
 # see program is gone with exit code
diff --git a/gdbserver_tests/nlgone_exit.stdoutB.exp b/gdbserver_tests/nlgone_exit.stdoutB.exp
index 3f4c712590..081e862c77 100644
--- a/gdbserver_tests/nlgone_exit.stdoutB.exp
+++ b/gdbserver_tests/nlgone_exit.stdoutB.exp
@@ -1,5 +1,2 @@
 Continuing.
-Program received signal SIGTRAP, Trace/breakpoint trap.
-0x........ in syscall ...
-Continuing.
 Program exited with code 01.