* gdb.base/solib-symbol.exp: Do not include directories in

	filenames in expected messages.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 89ba7cb07e574f9e959e1c7b31291ef032306d90..fcdc376711713965669961df5a316232450d6e1f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-09  Joseph Myers  <joseph@codesourcery.com>
+
+       * gdb.base/solib-symbol.exp: Do not include directories in
+       filenames in expected messages.
+
 2011-10-07  Doug Evans  <dje@google.com>
 
        * gdb.python/py-pp-maint.py: Add tests for `replace' arg.

diff --git a/gdb/testsuite/gdb.base/solib-symbol.exp b/gdb/testsuite/gdb.base/solib-symbol.exp
index 1b99b086eb4787b462cee90582e1e48fb467b93f..aa723c65611eea2703ee953e3bdf83432e134236 100644 (file)
--- a/gdb/testsuite/gdb.base/solib-symbol.exp
+++ b/gdb/testsuite/gdb.base/solib-symbol.exp
@@ -53,14 +53,14 @@ if ![runto_main] then {
 
 # Set a breakpoint in the binary.
 gdb_test "br foo2" \
-        "Breakpoint.*file.*${srcfile}.*" \
+        "Breakpoint.*file.*${testfile}\\.c.*" \
         "foo2 in main"
 
 delete_breakpoints
 
 # Break in the library.
 gdb_test "br foo" \
-        "Breakpoint.*file.*${srcfile_lib}.*" \
+        "Breakpoint.*file.*${libname}\\.c.*" \
         "foo in libmd"
 
 gdb_test "continue" \
@@ -69,7 +69,7 @@ gdb_test "continue" \
 
 # This symbol is now looked up in the ELF library.
 gdb_test "br foo2" \
-        "Breakpoint.*file.*${srcfile_lib}.*" \
+        "Breakpoint.*file.*${libname}\\.c.*" \
         "foo2 in mdlib"
 
 gdb_exit