From 55b1fd0ca04b1352a0d3048cc4df6aa6cd56e845 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 14 Oct 2011 16:05:05 +0000 Subject: [PATCH] * gdb.threads/attachstop-mt.exp: Add $srcfile to the linespecs. * gdb.threads/attach-stopped.exp (corefunc): Add $srcfile to the linespec. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.threads/attach-stopped.exp | 2 +- gdb/testsuite/gdb.threads/attachstop-mt.exp | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4303ccd4a37..2786a53d48d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-10-14 Tom Tromey + + * gdb.threads/attachstop-mt.exp: Add $srcfile to the linespecs. + * gdb.threads/attach-stopped.exp (corefunc): Add $srcfile to the + linespec. + 2011-10-13 Jan Kratochvil Fix internal error regression. diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp index 5b5e82baf7f..08a943746d2 100644 --- a/gdb/testsuite/gdb.threads/attach-stopped.exp +++ b/gdb/testsuite/gdb.threads/attach-stopped.exp @@ -78,7 +78,7 @@ proc corefunc { threadtype } { gdb_test "bt" ".*sleep.*main.*" "$threadtype: attach2 to stopped bt" } # This breakpoint is there for old/non-x86 kernels not restarting syscalls. - gdb_breakpoint [gdb_get_line_number "Second sleep"] + gdb_breakpoint $srcfile:[gdb_get_line_number "Second sleep"] set test "$threadtype: attach2 continue" gdb_test_multiple "continue" "continue ($test)" { -re "Continuing" { diff --git a/gdb/testsuite/gdb.threads/attachstop-mt.exp b/gdb/testsuite/gdb.threads/attachstop-mt.exp index c44b50f766d..12bf960f307 100644 --- a/gdb/testsuite/gdb.threads/attachstop-mt.exp +++ b/gdb/testsuite/gdb.threads/attachstop-mt.exp @@ -208,8 +208,8 @@ gdb_test "thread 2" ".*(witching to thread 2 |hread ID 2 not known).*" "attach4 gdb_test "bt" ".*sleep.*(func|main).*" "attach4 to stopped bt" # RHEL3U8 kernel-2.4.21-47.EL will not return SIGINT but only shorten the sleep. -gdb_breakpoint [gdb_get_line_number "Ridiculous time"] -gdb_breakpoint [gdb_get_line_number "cut the sleep time"] +gdb_breakpoint $srcfile:[gdb_get_line_number "Ridiculous time"] +gdb_breakpoint $srcfile:[gdb_get_line_number "cut the sleep time"] set test "attach4 continue" gdb_test_multiple "continue" "continue ($test)" { -re "Continuing" { -- 2.30.2