From 9e811bc379ef78f0e2beadda9ed3ce6679ded7ea Mon Sep 17 00:00:00 2001 From: Luis Machado Date: Tue, 14 Apr 2015 09:22:53 -0300 Subject: [PATCH] Harden gdb.base/bp-permanent.exp Reinstate test message and replace hardcoded test command with a variable. gdb/testsuite/ChangeLog: 2015-04-14 Luis Machado * gdb.base/bp-permanent.exp (test): Reinstate correct test message. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/bp-permanent.exp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a2f7328138d..c49519f319b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-04-14 Luis Machado + + * gdb.base/bp-permanent.exp (test): Reinstate correct test message. + 2015-04-13 Luis Machado * gdb.base/bp-permanent.exp (test): Handle the case of being unable diff --git a/gdb/testsuite/gdb.base/bp-permanent.exp b/gdb/testsuite/gdb.base/bp-permanent.exp index e802eee263d..cbdbc7577af 100644 --- a/gdb/testsuite/gdb.base/bp-permanent.exp +++ b/gdb/testsuite/gdb.base/bp-permanent.exp @@ -104,7 +104,8 @@ proc test {always_inserted sw_watchpoint} { # to memory manually. set count [expr $address_after_bp - $address_bp] for {set i 0} {$i < $count} {incr i} { - gdb_test_multiple "p /x addr_bp\[$i\] = buffer\[$i\]" $test { + set test "p /x addr_bp\[$i\] = buffer\[$i\]" + gdb_test_multiple $test $test { -re "Cannot access memory at address $hex.*$gdb_prompt $" { # Some targets (QEMU for one) will disallow writes to the # .text section under certain circumstances. It is no use -- 2.30.2