Re: [PATCH] Let gdbserver doesn't tell GDB it support target-side breakpoint conditions and commands if it doesn't support 'Z' packet

[Hui Zhu <hui_zhu at mentor dot com>]

On 12/03/13 12:49, Hui Zhu wrote:
> On 12/02/13 22:37, Pedro Alves wrote:
> > On 12/02/2013 12:45 PM, Hui Zhu wrote:
> > > On 11/29/13 23:10, Pedro Alves wrote:
> > > > > On 11/28/2013 09:07 AM, Hui Zhu wrote:
> > > > >
> > > > > > > +  if (have_target_target_side_commands)
> > > > >
> > > > > This can now just be:
> > > > >
> > > > >     if (!VEC_empty (agent_expr_p, bp_tgt->tcommands))
> > > > >
> > > > > OK with that change.
> > > > >
> > > > > > > +    {
> > > > > > > +      warning (_("\
> > > > > > > +Target doesn't support breakpoints that have target side commands."));
> > > > >
> > > > > I was doing to suggest making this an error instead, that
> > > > > insert_bp_location would print the error string, but that's
> > > > > only true for hw breakpoints... insert_bp_location's error
> > > > > handling is quite messy.  For instance, if this breakpoint
> > > > > is in a a shared library, this will disable the breakpoint,
> > > > > even though the cause of the error is clearly not that the
> > > > > shared library disappeared (i.e., not a memory error).
> > > > >
> > > > > > > +      return -1;
> > > > > > > +    }
> > > Updated the patch according to your comments.
> >
> > But you switched to "error" anyway?  Above I was saying that I
> > was going that suggest it, but then explained why I didn't think
> > it would work.  Was I wrong?
>
> The reason is insert_bp_location doesn't have code to handle this error.  I make a new patch that include this code.
>
> Please help me review it.
>
> > > And I make a patch for dprintf.exp and mi-dprintf.exp to make test OK on the target that doesn't support "Zx" packets.
> > >
> > > The patches were tested and pass regression test on X86_64 and PPC.
> >
> > (It's best to stick to one patch per email, otherwise things
> > end up confusing.  I suggest looking into git send-email.)
>
> OK.  I will post new version of this patch in another mail.
>
> Thanks,
> Hui

This patch is for dprintf.exp and mi-dprintf.exp to make test OK on the target that doesn't support "Zx" packets.

Thanks,
Hui

2013-12-03  Hui Zhu  <hui@codesourcery.com>

	PR gdb/16101
	* gdb.base/dprintf.exp: Add check for the the gdbserver of some
	architecture doesn't support some "Zx" doesn't support some "Zx"
	packets.
	* gdb.mi/mi-dprintf.exp: Ditto.
	* lib/mi-support.exp: Add check for continue get error.

--- a/gdb/testsuite/gdb.base/dprintf.exp
+++ b/gdb/testsuite/gdb.base/dprintf.exp
@@ -108,6 +108,26 @@ gdb_test_multiple "set dprintf-style age
     }
 }
 
+# Continue with target-side breakpoint commands will get error if GDB
+# work with The gdbserver of some architecture doesn't support some "Zx"
+# packets.
+if $target_can_dprintf {
+    gdb_run_cmd
+
+    gdb_test "" "Breakpoint"
+
+    set msg "continue with target-side breakpoint commands"
+    gdb_test_multiple "continue" $msg {
+	-re "Cannot insert breakpoint $decimal:.*\r\n.*\r\n$gdb_prompt $" {
+	    set target_can_dprintf 0
+	    pass "$msg - cannot do"
+	}
+	-re ".*$gdb_prompt $" {
+	    pass "$msg - can do"
+	}
+    }
+}
+
 if $target_can_dprintf {
     gdb_run_cmd
 
@@ -120,7 +140,7 @@ if $target_can_dprintf {
     gdb_test_sequence "info breakpoints" "dprintf info 2" {
 	"\[\r\n\]Num     Type           Disp Enb Address +What"
 	"\[\r\n\]2       breakpoint"
-	"\[\r\n\]\tbreakpoint already hit 2 times"
+	"\[\r\n\]\tbreakpoint already hit 3 times"
 	"\[\r\n\]3       dprintf"
 	"\[\r\n\]\tbreakpoint already hit 2 times"
 	"\[\r\n\]        agent-printf \"At foo entry\\\\n\""
--- a/gdb/testsuite/gdb.mi/mi-dprintf.exp
+++ b/gdb/testsuite/gdb.mi/mi-dprintf.exp
@@ -139,6 +139,16 @@ gdb_expect {
     }
 }
 
+# Continue with target-side breakpoint commands will get error if GDB
+# work with The gdbserver of some architecture doesn't support some "Zx"
+# packets.
+if $target_can_dprintf {
+    if {[mi_run_cmd] == -1} {
+	pass "continue with target-side breakpoint commands - cannot do"
+	set target_can_dprintf 0
+    }
+}
+
 if $target_can_dprintf {
     mi_run_cmd
 
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -843,6 +843,7 @@ proc mi_run_cmd_full {use_mi_command arg
 	    send_gdb "${run_prefix}continue\n"
 	    gdb_expect 60 {
 		-re "${run_match}\\^running\[\r\n\]+\\*running,thread-id=\"\[^\"\]+\"\r\n$mi_gdb_prompt" {}
+		-re "\\^error.*\r\n$mi_gdb_prompt" { return -1 }
 		default {}
 	    }
 	    return 0