|
From: <sv...@va...> - 2014-08-22 10:14:46
|
Author: mjw
Date: Fri Aug 22 10:14:28 2014
New Revision: 14331
Log:
Tweak gdbserver_tests/hgtls.stdoutB.exp filter_gdb a little for older GDB.
Older GDB (7.2 on i386) don't print out which variable+offset an argument
pointer in a breakpoint function points to. The hgtls test already tests
whether the p pointer/test points to the expected tests array element.
So don't expect gdb to print it also and filter it out with filter_gdb.
Modified:
trunk/gdbserver_tests/filter_gdb
trunk/gdbserver_tests/hgtls.stdoutB.exp
Modified: trunk/gdbserver_tests/filter_gdb
==============================================================================
--- trunk/gdbserver_tests/filter_gdb (original)
+++ trunk/gdbserver_tests/filter_gdb Fri Aug 22 10:14:28 2014
@@ -56,6 +56,7 @@
# finishes with a new line, sometimes not ???).
# 'exited with code' and 'exited normally' are printed slightly
# differently between gdb versions, normalize to "Program exited...".
+# for hgtls the breakpoint p=... address might show var location.
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/' \
@@ -102,6 +103,7 @@
-e 's/0x........ in \(main (argc=1, argv=0x........) at watchpoints.c:[24][3689]\)/\1/' \
-e 's/0x........ in \(main () at clean_after_fork.c:34\)/\1/' \
-e 's/\(^.*signal SIGFPE.*$\)/\1\nafter trap SIGFPE/' \
+ -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/VgTs_WaitSys) 0x/VgTs_WaitSys) 0x/' \
Modified: trunk/gdbserver_tests/hgtls.stdoutB.exp
==============================================================================
--- trunk/gdbserver_tests/hgtls.stdoutB.exp (original)
+++ trunk/gdbserver_tests/hgtls.stdoutB.exp Fri Aug 22 10:14:28 2014
@@ -1,59 +1,59 @@
Breakpoint 1 at 0x........: file tls.c, line 55.
Continuing.
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test race tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test race tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+16>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test local tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+16>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test local tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+32>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test global tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+32>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test global tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+48>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test static_extern tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+48>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test static_extern tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+64>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test so_extern tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+64>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test so_extern tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+80>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test so_local tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+80>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test so_local tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+96>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test so_global tls_ip 0x........ ip 0x........ equal 1
[New Thread ....]
-Breakpoint 1, tls_ptr (p=0x........ <tests+96>) at tls.c:55
+Breakpoint 1, tls_ptr (p=0x........) at tls.c:55
55 int here = 0;
test so_global tls_ip 0x........ ip 0x........ equal 1
Program exited normally.
|