[PATCH] Expect for "@" when doing "complete break ada" on gdb.ada/complete.exp

[PATCH] Expect for "@" when doing "complete break ada" on gdb.ada/complete.exp

[Sergio Durigan Junior]

Currently, gdb.ada/complete.exp's "complete break ada" test fails
because the regexp used to match the command's output doesn't expect
"@", but we have an output like:

  ...
  complete break ada
  break ada.assertions.assert
  break ada.calendar.arithmetic.difference
  break ada.calendar.arithmetic_operations.add
  break ada.calendar.arithmetic_operations.add.cold
  break ada.calendar.arithmetic_operations.add@plt
  break ada.calendar.arithmetic_operations.difference
  break ada.calendar.arithmetic_operations.difference@plt
  ...

This patch adds "@" to the regexp, unbreaking the test.

OK?

gdb/testsuite/ChangeLog:
2018-09-17  Sergio Durigan Junior  <sergiodj@redhat.com>

	* gdb.ada/complete.exp: Expect for "@" when doing "complete
	break ada".
---
 gdb/testsuite/gdb.ada/complete.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.ada/complete.exp b/gdb/testsuite/gdb.ada/complete.exp
index cb9e4ae7ff..ac2bf85077 100644
--- a/gdb/testsuite/gdb.ada/complete.exp
+++ b/gdb/testsuite/gdb.ada/complete.exp
@@ -218,7 +218,7 @@ gdb_test_no_output "set max-completions unlimited"
 
 set test "complete break ada"
 gdb_test_multiple "$test" $test {
-    -re "^$test$eol\(break ada(\[a-z0-9._\])*$eol\)+$gdb_prompt $" {
+    -re "^$test$eol\(break ada(\[a-z0-9._@\])*$eol\)+$gdb_prompt $" {
         pass $test
     }
     -re "\[A-Z\].*$gdb_prompt $" {
-- 
2.17.1

Re: [PATCH] Expect for "@" when doing "complete break ada" on gdb.ada/complete.exp

[Joel Brobecker]

Hi Sergio,

Thanks for the patch!

> Currently, gdb.ada/complete.exp's "complete break ada" test fails
> because the regexp used to match the command's output doesn't expect
> "@", but we have an output like:
> 
>   ...
>   complete break ada
>   break ada.assertions.assert
>   break ada.calendar.arithmetic.difference
>   break ada.calendar.arithmetic_operations.add
>   break ada.calendar.arithmetic_operations.add.cold
>   break ada.calendar.arithmetic_operations.add@plt
>   break ada.calendar.arithmetic_operations.difference
>   break ada.calendar.arithmetic_operations.difference@plt
>   ...
> 
> This patch adds "@" to the regexp, unbreaking the test.
> 
> OK?
> 
> gdb/testsuite/ChangeLog:
> 2018-09-17  Sergio Durigan Junior  <sergiodj@redhat.com>
> 
> 	* gdb.ada/complete.exp: Expect for "@" when doing "complete
> 	break ada".

I can see this behavior, but only when I link with the shared
version of libgnat. For us at least, on x86_64-linux, this is not
the default. That's probably why I wasn't seeing this.

This is OK.

>  gdb/testsuite/gdb.ada/complete.exp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gdb/testsuite/gdb.ada/complete.exp b/gdb/testsuite/gdb.ada/complete.exp
> index cb9e4ae7ff..ac2bf85077 100644
> --- a/gdb/testsuite/gdb.ada/complete.exp
> +++ b/gdb/testsuite/gdb.ada/complete.exp
> @@ -218,7 +218,7 @@ gdb_test_no_output "set max-completions unlimited"
>  
>  set test "complete break ada"
>  gdb_test_multiple "$test" $test {
> -    -re "^$test$eol\(break ada(\[a-z0-9._\])*$eol\)+$gdb_prompt $" {
> +    -re "^$test$eol\(break ada(\[a-z0-9._@\])*$eol\)+$gdb_prompt $" {
>          pass $test
>      }
>      -re "\[A-Z\].*$gdb_prompt $" {
> -- 
> 2.17.1

-- 
Joel

Re: [PATCH] Expect for "@" when doing "complete break ada" on gdb.ada/complete.exp

[Sergio Durigan Junior]

On Tuesday, September 18 2018, Joel Brobecker wrote:

> Hi Sergio,

Hey Joel,

> Thanks for the patch!

My pleasure :-).

>> Currently, gdb.ada/complete.exp's "complete break ada" test fails
>> because the regexp used to match the command's output doesn't expect
>> "@", but we have an output like:
>> 
>>   ...
>>   complete break ada
>>   break ada.assertions.assert
>>   break ada.calendar.arithmetic.difference
>>   break ada.calendar.arithmetic_operations.add
>>   break ada.calendar.arithmetic_operations.add.cold
>>   break ada.calendar.arithmetic_operations.add@plt
>>   break ada.calendar.arithmetic_operations.difference
>>   break ada.calendar.arithmetic_operations.difference@plt
>>   ...
>> 
>> This patch adds "@" to the regexp, unbreaking the test.
>> 
>> OK?
>> 
>> gdb/testsuite/ChangeLog:
>> 2018-09-17  Sergio Durigan Junior  <sergiodj@redhat.com>
>> 
>> 	* gdb.ada/complete.exp: Expect for "@" when doing "complete
>> 	break ada".
>
> I can see this behavior, but only when I link with the shared
> version of libgnat. For us at least, on x86_64-linux, this is not
> the default. That's probably why I wasn't seeing this.

Ah, I see.  TBH, I haven't investigate this further.  I'm glad you can
reproduce it there.

> This is OK.

Thanks, pushed.

7a6d2b458f95030f433a0dcdabd5cda7ee695a9b

-- 
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF  31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
http://sergiodj.net/