From: jkratoch <jkratoch>
Date: Sun, 16 Oct 2011 08:42:02 +0000 (+0000)
Subject: gdb/testsuite/
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7e8f1cfac2288aa657cb34714870eabfbd5061a8;p=pf3gnuchains%2Fpf3gnuchains4x.git

gdb/testsuite/
	Fix results with system glibc debug info installed.
	* gdb.base/disp-step-syscall.exp (continue to $syscall (1st time))
	(continue to $syscall (2nd time), continue to $syscall (3rd time)):
	Accept also __libc_ symbol prefix and no prefix.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1de5d3c9fa..7a65e9fb93 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix results with system glibc debug info installed.
+	* gdb.base/disp-step-syscall.exp (continue to $syscall (1st time))
+	(continue to $syscall (2nd time), continue to $syscall (3rd time)):
+	Accept also __libc_ symbol prefix and no prefix.
+
 2011-10-14  Keith Seitz  <keiths@redhat.com>
 
 	PR c++/13225
diff --git a/gdb/testsuite/gdb.base/disp-step-syscall.exp b/gdb/testsuite/gdb.base/disp-step-syscall.exp
index a84ca29eb7..36c9e2a352 100644
--- a/gdb/testsuite/gdb.base/disp-step-syscall.exp
+++ b/gdb/testsuite/gdb.base/disp-step-syscall.exp
@@ -64,13 +64,13 @@ proc disp_step_cross_syscall { syscall } {
 	}
     }
 
-    gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, .* in $syscall ().*" \
+    gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in |__libc_|)$syscall \\(\\).*" \
 	"continue to $syscall (1st time)"
     # Hit the breakpoint on $syscall for the first time.  In this time, we will let PLT
     # resolution done, and the number single steps we will do later will be
     # reduced.
 
-    gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, .* in $syscall ().*" \
+    gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in |__libc_|)$syscall \\(\\).*" \
 	"continue to $syscall (2nd time)"
     # Hit the breakpoint on $syscall for the second time.  In this time, the address
     # of syscall insn and next insn of syscall are recorded.
@@ -102,7 +102,7 @@ proc disp_step_cross_syscall { syscall } {
     gdb_test "stepi" ".*" "stepi $syscall insn"
     set syscall_insn_next_addr [get_hexadecimal_valueof "\$pc" "0"]
 
-    gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, .* in $syscall ().*" \
+    gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, (.* in |__libc_|)$syscall \\(\\).*" \
 	"continue to $syscall (3rd time)"
 
     # Hit the breakpoint on $syscall for the third time.  In this time, we'll set