From 498a44896d5420739d7485fd52336b87410a0680 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 20 May 2014 13:45:54 +0800 Subject: [PATCH] Specify source file explicitly when setting a breakpoint When I run no-thread-db.exp, the breakpoint is set on line 26. However, the breakpoint is set to line 26 of dl-start.S rather than no-thread-db.c, which is not intended. (gdb) monitor set libthread-db-search-path /foo/bar^M libthread-db-search-path set to `/foo/bar'^M (gdb) PASS: gdb.server/no-thread-db.exp: libthread-db is now unresolvable break 26^M Breakpoint 1 at 0x48018078: file ../sysdeps/powerpc/powerpc32/dl-start.S, line 26.^M (gdb) continue^M Continuing. This patch is to change the breakpoint setting with source file specified, then it is correct now. gdb/testsuite: 2014-05-26 Yao Qi * gdb.server/no-thread-db.exp: Specify source file name explicitly when setting a breakpoint. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.server/no-thread-db.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 11f49ea9a4..de32b614c9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-05-26 Yao Qi + + * gdb.server/no-thread-db.exp: Specify source file name + explicitly when setting a breakpoint. + 2014-05-23 Markus Metzger * gdb.btrace/vdso.c: New. diff --git a/gdb/testsuite/gdb.server/no-thread-db.exp b/gdb/testsuite/gdb.server/no-thread-db.exp index 9246fa9bb5..8a9c2919c6 100644 --- a/gdb/testsuite/gdb.server/no-thread-db.exp +++ b/gdb/testsuite/gdb.server/no-thread-db.exp @@ -47,7 +47,7 @@ gdb_test "monitor set libthread-db-search-path ${unresolvable_thread_db_path}" \ "libthread-db is now unresolvable" # Continue past tls assignment to make sure tls storage is allocated. -gdb_breakpoint [gdb_get_line_number "after tls assignment"] +gdb_breakpoint ${srcfile}:[gdb_get_line_number "after tls assignment"] gdb_continue_to_breakpoint "after tls assignment" # Printing a tls variable should fail gracefully without a libthread_db. -- 2.34.1