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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a2f7328138dd87c177c748c0a771be12e421dc2e..c49519f319b0aef81cc163e61a51d4661a513e13 100644 (file)
--- 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 e802eee263d0c03fe86ba6a32bfb4ecd9baf107a..cbdbc7577afcfa4c18413a9f8322287caf480c41 100644 (file)
--- 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