From 381bc39bef1c385aedff99db5d9eca044365670f Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 4 Jan 2007 20:42:24 +0000 Subject: [PATCH] * gdb.base/charset.exp: Add explicit filename to break. * gdb.base/dbx.exp: Add explicit filename to breaks. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/charset.exp | 2 +- gdb/testsuite/gdb.base/dbx.exp | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1738cb6..2ee358f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2007-01-04 Pedro Alves + * gdb.base/charset.exp: Add explicit filename to break. + * gdb.base/dbx.exp: Add explicit filename to breaks. + +2007-01-04 Pedro Alves + * gdb.mi/mi-file.exp: Use mi_gdb_file_cmd instead of mi_gdb_load. * gdb.mi/mi2-file.exp: Likewise. diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp index 212f3b3..e5d8dfb 100644 --- a/gdb/testsuite/gdb.base/charset.exp +++ b/gdb/testsuite/gdb.base/charset.exp @@ -388,7 +388,7 @@ foreach host_charset [all_charset_names] { # some strings in various target character sets. We need to run the # test program to the point at which the strings have been # initialized. -gdb_test "break [gdb_get_line_number "all strings initialized"]" \ +gdb_test "break ${srcfile}:[gdb_get_line_number "all strings initialized"]" \ ".*Breakpoint.* at .*" \ "set breakpoint after all strings have been initialized" gdb_run_cmd diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index 98f4481..d2ebd57 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -266,8 +266,8 @@ proc gdb_file_cmd {arg} { proc test_breakpoints { } { gdb_test "stop in main" "Breakpoint.*at.*: file.*average\.c, line 38\." gdb_test "status" "Num.*Type.*Disp.*Enb.*Address.*What\r\n1\[ \r\]+breakpoint\[ \r\]+keep y.*in main at.*average\.c:38.*" - gdb_test "stop at 43" "Breakpoint.*at.*: file.*average\.c, line 43.*" - gdb_test "stop in 43" "Usage: stop in " + gdb_test "stop at average.c:43" "Breakpoint.*at.*: file.*average\.c, line 43.*" + gdb_test "stop in average.c:43" "Usage: stop in " gdb_test "stop at main" "Usage: stop at " } -- 2.7.4