summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Machado <lgustavo@codesourcery.com>2015-04-14 09:22:53 -0300
committerLuis Machado <lgustavo@codesourcery.com>2015-04-14 09:25:27 -0300
commit9e811bc379ef78f0e2beadda9ed3ce6679ded7ea (patch)
tree1eee36dbc6e9a76b3ed2d350fe63ef40cdb42e74
parent326a5c7e368d49251ad48b2091388d8f424bfc54 (diff)
downloadbinutils-gdb-9e811bc379ef78f0e2beadda9ed3ce6679ded7ea.tar.gz
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 <lgustavo@codesourcery.com> * gdb.base/bp-permanent.exp (test): Reinstate correct test message.
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.base/bp-permanent.exp3
2 files changed, 6 insertions, 1 deletions
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 <lgustavo@codesourcery.com>
+
+ * gdb.base/bp-permanent.exp (test): Reinstate correct test message.
+
2015-04-13 Luis Machado <lgustavo@codesourcery.com>
* 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