[3/3] gdb/testsuite/gdb.cp/annota2.exp: Add missing empty line, in output.

Message ID 51AF1449.5070309@linaro.org
State Accepted
Headers show

Commit Message

Will Newton June 5, 2013, 10:34 a.m.
There should be an empty line between "post-prompt" and "starting".
This fixes a testsuite failure on ARM.

gdb/testsuite/ChangeLog:

2013-06-05  Will Newton  <will.newton@linaro.org>

	* gdb.cp/annota2.exp: Add empty line between "post-prompt"
	and "starting".
---
 gdb/testsuite/gdb.cp/annota2.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Tromey June 5, 2013, 3:48 p.m. | #1
>>>>> "Will" == Will Newton <will.newton@linaro.org> writes:

Will> There should be an empty line between "post-prompt" and "starting".
Will> This fixes a testsuite failure on ARM.

Will> gdb/testsuite/ChangeLog:

Will> 2013-06-05  Will Newton  <will.newton@linaro.org>

Will> 	* gdb.cp/annota2.exp: Add empty line between "post-prompt"
Will> 	and "starting".

This is ok.

This test still KFAILs for me, on x86-64 F18.
It seems that the watchpoint doesn't actually trigger.

Tom
Will Newton June 5, 2013, 5:48 p.m. | #2
On 5 June 2013 16:48, Tom Tromey <tromey@redhat.com> wrote:
>>>>>> "Will" == Will Newton <will.newton@linaro.org> writes:
>
> Will> There should be an empty line between "post-prompt" and "starting".
> Will> This fixes a testsuite failure on ARM.
>
> Will> gdb/testsuite/ChangeLog:
>
> Will> 2013-06-05  Will Newton  <will.newton@linaro.org>
>
> Will>   * gdb.cp/annota2.exp: Add empty line between "post-prompt"
> Will>   and "starting".
>
> This is ok.
>
> This test still KFAILs for me, on x86-64 F18.
> It seems that the watchpoint doesn't actually trigger.

I get a KFAIL on x86_64 also, but on ARM prior to this change I would
get a timeout.

I can commit to binutils but not have not committed to gdb thus far.

--
Will Newton
Toolchain Working Group, Linaro
Tom Tromey June 5, 2013, 7:19 p.m. | #3
Will> I can commit to binutils but not have not committed to gdb thus far.

Do you have the necessary paperwork in place for gdb?

You are in the correct group on sourceware, because gdb and binutils
share a repository.

Tom
Will Newton June 6, 2013, 9:04 a.m. | #4
On 5 June 2013 20:19, Tom Tromey <tromey@redhat.com> wrote:
> Will> I can commit to binutils but not have not committed to gdb thus far.
>
> Do you have the necessary paperwork in place for gdb?

I believe it is covered by the Linaro assignment.

> You are in the correct group on sourceware, because gdb and binutils
> share a repository.

I'm happy to commit the changes myself, I just wanted to make sure it
was ok before going ahead.

--
Will Newton
Toolchain Working Group, Linaro
Pedro Alves June 6, 2013, 10:33 a.m. | #5
On 06/06/2013 10:04 AM, Will Newton wrote:
> On 5 June 2013 20:19, Tom Tromey <tromey@redhat.com> wrote:
>> Will> I can commit to binutils but not have not committed to gdb thus far.
>>
>> Do you have the necessary paperwork in place for gdb?
> 
> I believe it is covered by the Linaro assignment.

Confirmed.  Linaro has blanket assignment for GDB covering all employees.

> 
>> You are in the correct group on sourceware, because gdb and binutils
>> share a repository.
> 
> I'm happy to commit the changes myself, I just wanted to make sure it
> was ok before going ahead.

Could you please commit (and post) a patch adding yourself to
Write After Approval in gdb/MAINTAINERS?

Thanks!

Patch

diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
index d0a457a..0c17947 100644
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
@@ -162,7 +162,7 @@  gdb_test_multiple "watch a.x" "set watch on a.x" {
 # annotate-watchpoint
 #
 gdb_test_multiple "next" "watch triggered on a.x" {
-    -re "\r\n\032\032post-prompt\r\n\032\032starting\r\n${frames_invalid}${breakpoints_invalid}\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" {
+    -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n${frames_invalid}${breakpoints_invalid}\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" {
 	pass "watch triggered on a.x"
     }
     -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n${frames_invalid}\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" {