From: Mark Wielaard Date: Tue, 2 Sep 2014 10:16:42 +0000 (+0000) Subject: Tweak gdbserver_tests/mcinfcallWSRU.stderrB.exp to match more gdb versions. X-Git-Tag: svn/VALGRIND_3_10_0~80 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41e08a29eb82351644c0fd4746aad9502798baaa;p=thirdparty%2Fvalgrind.git Tweak gdbserver_tests/mcinfcallWSRU.stderrB.exp to match more gdb versions. Some gdb versions don't show the source line:number after switching threads in #0 0x........ in do_burn (). Filter "at line:number" out and don't expect it. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14427 --- diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb index 4a516d3f1c..239e76f370 100755 --- a/gdbserver_tests/filter_gdb +++ b/gdbserver_tests/filter_gdb @@ -58,6 +58,8 @@ sed -e '/^\ \ \ \ \.\.\.$/d' | # differently between gdb versions, normalize to "Program exited...". # for hgtls the breakpoint p=... address might show var location. # gdb might also try to show the "entry value" p=p@entry=0x... +# Some gdb versions don't show the source line:number after switching +# threads in #0 0x........ in do_burn (). 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/' \ @@ -71,6 +73,7 @@ sed -e '/Remote debugging using/,/vgdb launched process attached/d' -e 's/\(\[Switching to thread [1234] (Thread ....)\]\)#0/\1\n#0/' \ -e 's/^\([ \* ] [0-9] Thread .... (tid [0-9] VgTs_WaitSys) 0x........ in\).*$/\1 syscall .../' \ -e 's/#[0-9]\( 0x........ in sleeper_or_burner\)/#.\1/' \ + -e 's/\(#0 0x........ in do_burn ()\) at sleepers.c:39/\1/' \ -e '/^Reading symbols from .*\.\.\.done\./d' \ -e '/^Loaded symbols for .*$/d' \ -e '/^Current language.*/d' \ diff --git a/gdbserver_tests/mcinfcallWSRU.stderrB.exp b/gdbserver_tests/mcinfcallWSRU.stderrB.exp index 137e19a2ce..5710545290 100644 --- a/gdbserver_tests/mcinfcallWSRU.stderrB.exp +++ b/gdbserver_tests/mcinfcallWSRU.stderrB.exp @@ -21,7 +21,7 @@ Program received signal SIGTRAP, Trace/breakpoint trap. 0x........ in do_burn () at sleepers.c:39 39 for (i = 0; i < burn; i++) loopnr++; [Switching to thread 1 (Thread ....)] -#0 0x........ in do_burn () at sleepers.c:39 +#0 0x........ in do_burn () 39 for (i = 0; i < burn; i++) loopnr++; $1 = void [Switching to thread 2 (Thread ....)]