Re: [PATCH] Harden gdb.base/bp-permanent.exp

[Luis Machado <lgustavo@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]

On 04/14/2015 08:31 AM, Pedro Alves wrote:
> Hi Luis,
>
> On 04/13/2015 06:51 PM, Luis Machado wrote:
>
>> I've pushed this now.
>
> I've just noticed this:
>
> -PASS: gdb.base/bp-permanent.exp: always_inserted=off, sw_watchpoint=0: setup: p /x addr_bp[0] = buffer[0]
> -PASS: gdb.base/bp-permanent.exp: always_inserted=off, sw_watchpoint=0: setup: p /x addr_bp[1] = buffer[1]
> -PASS: gdb.base/bp-permanent.exp: always_inserted=off, sw_watchpoint=0: setup: p /x addr_bp[2] = buffer[2]
> -PASS: gdb.base/bp-permanent.exp: always_inserted=off, sw_watchpoint=0: setup: p /x addr_bp[3] = buffer[3]
> +PASS: gdb.base/bp-permanent.exp: always_inserted=off, sw_watchpoint=0: setup: get size of instruction
> +PASS: gdb.base/bp-permanent.exp: always_inserted=off, sw_watchpoint=0: setup: get size of instruction
> +PASS: gdb.base/bp-permanent.exp: always_inserted=off, sw_watchpoint=0: setup: get size of instruction
> +PASS: gdb.base/bp-permanent.exp: always_inserted=off, sw_watchpoint=0: setup: get size of instruction
>
> Obviously, "get size of instruction" is the wrong test message to
> use here.  Could you restore the old messages please?

Oops, sorry. How about the attached?




[-- Attachment #2: bp-perm.diff --]
[-- Type: text/x-patch, Size: 778 bytes --]

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