2015-04-14  Luis Machado  <lgustavo@codesourcery.com>

	gdb/testsuite/
	* gdb.base/bp-permanent.exp: Reinstate correct test message.

diff --git a/gdb/testsuite/gdb.base/bp-permanent.exp b/gdb/testsuite/gdb.base/bp-permanent.exp
index e802eee..4d7e519 100644
--- a/gdb/testsuite/gdb.base/bp-permanent.exp
+++ b/gdb/testsuite/gdb.base/bp-permanent.exp
@@ -104,6 +104,7 @@ 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} {
+	    set test "p /x addr_bp\[$i\] = buffer\[$i\]"
 	    gdb_test_multiple "p /x addr_bp\[$i\] = buffer\[$i\]" $test {
 		-re "Cannot access memory at address $hex.*$gdb_prompt $" {
 		    # Some targets (QEMU for one) will disallow writes to the