From af369495707bffd0a2bdfc8ba5a088e23d8d4b8f Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sun, 9 Oct 2011 18:14:41 +0000 Subject: [PATCH] * gdb.base/solib-symbol.exp: Do not include directories in filenames in expected messages. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/solib-symbol.exp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 89ba7cb..fcdc376 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-10-09 Joseph Myers + + * gdb.base/solib-symbol.exp: Do not include directories in + filenames in expected messages. + 2011-10-07 Doug Evans * 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 1b99b08..aa723c6 100644 --- 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 -- 2.7.4