From: Tom de Vries Date: Wed, 11 Mar 2020 16:57:02 +0000 (+0100) Subject: [gdb/testsuite] Fix printf regexp in gdb.server/sysroot.exp X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f870f78fb2dc15cc5a4738d7ee592b39e2001c4e;p=deliverable%2Fbinutils-gdb.git [gdb/testsuite] Fix printf regexp in gdb.server/sysroot.exp When running gdb.server/sysroot.exp, I run into this FAIL: ... (gdb) continue^M Continuing.^M ^M Breakpoint 2, __printf (format=0x4005c4 "Hello World!\n") at printf.c:28^M 28 {^M (gdb) FAIL: gdb.server/sysroot.exp: sysroot=local: continue to printf ... for this test: ... gdb_test "continue" "Breakpoint $decimal.* printf .*" "continue to printf" ... Without debug info for glibc installed, we have instead: ... (gdb) continue^M Continuing.^M ^M Breakpoint 2, 0x00007ffff773c550 in printf () from /lib64/libc.so.6^M (gdb) PASS: gdb.server/sysroot.exp: sysroot=local: continue to printf ... Fix this by allowing for GLIBC's printf alias __printf to be printed: ... gdb_test "continue" "Breakpoint $decimal.* (__)?printf .*" \ "continue to printf" ... Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-03-11 Tom de Vries * gdb.server/sysroot.exp: Allow GLIBC's printf alias __printf. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5613e86261..f7cdea7da8 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-03-11 Tom de Vries + + * gdb.server/sysroot.exp: Allow GLIBC's printf alias __printf. + 2020-03-11 Tom de Vries * gdb.btrace/reconnect.exp: Allow source line pattern after stepi. diff --git a/gdb/testsuite/gdb.server/sysroot.exp b/gdb/testsuite/gdb.server/sysroot.exp index fd6f43b1b1..2c68ebf287 100644 --- a/gdb/testsuite/gdb.server/sysroot.exp +++ b/gdb/testsuite/gdb.server/sysroot.exp @@ -73,5 +73,6 @@ foreach_with_prefix sysroot { "local" "remote" } { # Test that we can stop inside a library. gdb_breakpoint printf - gdb_test "continue" "Breakpoint $decimal.* printf .*" "continue to printf" + gdb_test "continue" "Breakpoint $decimal.* (__)?printf .*" \ + "continue to printf" }