From 42c0c4f1c509c9077a24405c6bf8bb679cf64b68 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Mon, 2 Aug 2010 15:07:14 +0000 Subject: [PATCH] * gdb.base/break-always.exp: Do not expect full paths to file names. * gdb.base/commands.exp: Likewise. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/break-always.exp | 2 +- gdb/testsuite/gdb.base/commands.exp | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index cbcf0a96a8..b0fc7461f7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-07-30 Kazu Hirata + + * gdb.base/break-always.exp: Do not expect full paths to file + names. + * gdb.base/commands.exp: Likewise. + 2010-07-30 Doug Evans * gdb.cp/temargs.exp: For new tests that require newer gccs, diff --git a/gdb/testsuite/gdb.base/break-always.exp b/gdb/testsuite/gdb.base/break-always.exp index 6eb0356f70..c1cf00d33f 100644 --- a/gdb/testsuite/gdb.base/break-always.exp +++ b/gdb/testsuite/gdb.base/break-always.exp @@ -29,7 +29,7 @@ gdb_test "show breakpoint always-inserted" "mode is on\." \ runto foo gdb_test "break bar" "Breakpoint 2.*" "set breakpoint on bar" -gdb_continue_to_breakpoint "bar" ".*/break-always.c:$bar_location.*" +gdb_continue_to_breakpoint "bar" ".*break-always.c:$bar_location.*" diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 7151206857..9dabf88015 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -427,7 +427,7 @@ proc bp_deleted_in_command_test {} { # Create a breakpoint, and associate a command-list to it, with # one command that deletes this breakpoint. gdb_test "break factorial" \ - "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \ + "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\." \ "breakpoint in bp_deleted_in_command_test" gdb_test_multiple "commands" "begin commands in bp_deleted_in_command_test" { @@ -489,7 +489,7 @@ proc temporary_breakpoint_commands {} { # This test will verify that this commands list is executed when the # breakpoint is hit. gdb_test "tbreak factorial" \ - "Temporary breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \ + "Temporary breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\." \ "breakpoint in temporary_breakpoint_commands" gdb_test_multiple "commands" \ @@ -634,7 +634,7 @@ proc if_commands_test {} { } } gdb_test_multiple "end" "second end - $test" { - -re "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\.\r\n$gdb_prompt $" { + -re "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\.\r\n$gdb_prompt $" { pass "second end - $test" } -re "Undefined command: \"silent\".*$gdb_prompt $" { @@ -660,7 +660,7 @@ proc if_commands_test {} { } } gdb_test_multiple "end" "second end - $test" { - -re "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\.\r\n$gdb_prompt $" { + -re "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\.\r\n$gdb_prompt $" { pass "second end - $test" } }