|
From: <sv...@va...> - 2016-04-03 15:24:28
|
Author: mjw
Date: Sun Apr 3 16:24:20 2016
New Revision: 15844
Log:
Update gdbserver_tests filter for newer GDB version.
- Newer gdb say Thread .... hit Breakpoint, we expect just Breakpoint.
- We expect "Program received" instead of "Thread .... received"
- Ordering of ' Thread .... (tid .' might differ between gdb version,
so remove all such lines except the "current" one (starts with '*').
Modified:
trunk/gdbserver_tests/filter_gdb
trunk/gdbserver_tests/nlcontrolc.stdoutB.exp
Modified: trunk/gdbserver_tests/filter_gdb
==============================================================================
--- trunk/gdbserver_tests/filter_gdb (original)
+++ trunk/gdbserver_tests/filter_gdb Sun Apr 3 16:24:20 2016
@@ -62,6 +62,10 @@
# 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 ().
+# Newer gdb say Thread .... hit Breakpoint, we expect just Breakpoint.
+# We expect "Program received" instead of "Thread .... received"
+# Ordering of ' Thread .... (tid .' might differ between gdb version,
+# so remove all such lines except the "current" one (starts with '*').
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/' \
@@ -74,6 +78,8 @@
-e '/\[Switching to Thread ....\]/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/^Thread .... hit Breakpoint /Breakpoint /' \
+ -e 's/^Thread .... received /Program received /' \
-e 's/#[0-9]\( 0x........ in sleeper_or_burner\)/#.\1/' \
-e 's/\(#0 0x........ in do_burn ()\) at sleepers.c:41/\1/' \
-e '/^Reading symbols from .*\.\.\.done\./d' \
@@ -115,6 +121,7 @@
-e 's/\(^Breakpoint 1, tls_ptr (p=0x........\) <tests[0-9+]*>\() at tls.c:55\)/\1\2/' \
-e '/Id Target Id Frame/d' \
-e 's/^\([ \*] [1234] \) *Thread /\1Thread /' \
+ -e 's/^ [0-9] Thread .... (tid [0-9] .*$//' \
-e 's/VgTs_WaitSys) 0x/VgTs_WaitSys) 0x/' \
-e '/Cannot access memory at address 0x......../d' \
-e '/\[New Thread/d' \
Modified: trunk/gdbserver_tests/nlcontrolc.stdoutB.exp
==============================================================================
--- trunk/gdbserver_tests/nlcontrolc.stdoutB.exp (original)
+++ trunk/gdbserver_tests/nlcontrolc.stdoutB.exp Sun Apr 3 16:24:20 2016
@@ -1,9 +1,6 @@
Continuing.
Program received signal SIGTRAP, Trace/breakpoint trap.
0x........ in syscall ...
- 4 Thread .... (tid 4 VgTs_WaitSys) 0x........ in syscall ...
- 3 Thread .... (tid 3 VgTs_WaitSys) 0x........ in syscall ...
- 2 Thread .... (tid 2 VgTs_WaitSys) 0x........ in syscall ...
* 1 Thread .... (tid 1 VgTs_WaitSys) 0x........ in syscall ...
$1 = 0
$2 = 0
|