* gdb.base/charset.exp: Add explicit filename to break.

* gdb.base/dbx.exp: Add explicit filename to breaks.

gdb/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2007-01-04  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* gdb.base/charset.exp: Add explicit filename to break.
+	* gdb.base/dbx.exp: Add explicit filename to breaks.
+
 2007-01-04  Pedro Alves  <pedro_alves@portugalmail.pt>
 
 	* gdb.mi/mi-file.exp: Use mi_gdb_file_cmd instead of mi_gdb_load.

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

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 <function . address>"
+    gdb_test "stop at average.c:43" "Breakpoint.*at.*: file.*average\.c, line 43.*"
+    gdb_test "stop in average.c:43" "Usage: stop in <function . address>"
     gdb_test "stop at main" "Usage: stop at <line>"
 }