Re: [PATCH] Handle memory write errors on gdb.base/break-always.exp

[Luis Machado <lgustavo at codesourcery dot com>]

On 04/28/2015 07:46 AM, Yao Qi wrote:
> Luis Machado <lgustavo@codesourcery.com> writes:
>
> > Ping?
>
> Hi Luis,
> I've approved this patch here
> https://sourceware.org/ml/gdb-patches/2015-04/msg00512.html  If my
> comments are addressed in the updated patch, you can push it in.

Sorry. For some reason i didn't get that reply. I did the changes and 
pushed the attached patch in.

Thanks,
Luis


diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 639dae7..3e2df8f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-29  Luis Machado  <lgustavo@codesourcery.com>
+
+	* gdb.base/break-always.exp: Abort testing if writing to memory
+	causes an error.
+
 2015-04-28  Doug Evans  <dje@google.com>
 
 	* gdb.python/py-pp-maint.py: Move "replace" testing to ...
diff --git a/gdb/testsuite/gdb.base/break-always.exp b/gdb/testsuite/gdb.base/break-always.exp
index 681be37..c45ce54 100644
--- a/gdb/testsuite/gdb.base/break-always.exp
+++ b/gdb/testsuite/gdb.base/break-always.exp
@@ -69,19 +69,25 @@ gdb_test "p /x \$shadow = *(char *) $bp_address" \
 # and still leave the breakpoint insn planted.  Try twice with
 # different values, in case we happen to be writting exactly what was
 # there already.
-gdb_test "p /x *(char *) $bp_address = 0" \
-    " = 0x0" \
-    "write 0 to breakpoint's address"
-gdb_test "p /x *(char *) $bp_address" \
-    " = 0x0" \
-    "read back 0 from the breakpoint's address"
-
-gdb_test "p /x *(char *) $bp_address = 1" \
-    " = 0x1" \
-    "write 1 to breakpoint's address"
-gdb_test "p /x *(char *) $bp_address" \
-    " = 0x1" \
-    "read back 1 from the breakpoint's address"
+foreach test_value {0 1} {
+    set write_test "write $test_value to breakpoint's address"
+
+    gdb_test_multiple "p /x *(char *) $bp_address = $test_value" $write_test {
+	-re "Cannot access memory at address $hex.*$gdb_prompt $" {
+
+	    # Some targets do not allow manually writing a breakpoint to a
+	    # certain memory address, like QEMU.  In that case, just bail out.
+	    unsupported "Cannot write to address $bp_address"
+	    return -1
+	}
+	-re " = .*$gdb_prompt $" {
+	    pass $write_test
+	}
+    }
+
+    set read_test "read back $test_value from the breakpoint's address"
+    gdb_test "p /x *(char *) $bp_address" " = 0x$test_value" $read_test
+}
 
 # Restore the original contents.
 gdb_test "p /x *(char *) $bp_address = \$shadow" "" \