[PATCH] gdb/testsuite: Remove duplicates in gdb.base/catch-signal.exp

[PATCH] gdb/testsuite: Remove duplicates in gdb.base/catch-signal.exp

[Lancelot SIX]

When running the testsuite I have the following:

    Running .../gdb/testsuite/gdb.base/catch-signal.exp ...
    DUPLICATE: gdb.base/catch-signal.exp: SIGHUP: continue
    DUPLICATE: gdb.base/catch-signal.exp: SIGHUP: continue
    DUPLICATE: gdb.base/catch-signal.exp: 1: continue
    DUPLICATE: gdb.base/catch-signal.exp: 1: continue
    DUPLICATE: gdb.base/catch-signal.exp: SIGHUP SIGUSR2: continue
    DUPLICATE: gdb.base/catch-signal.exp: SIGHUP SIGUSR2: continue

This patch removes DUPLICATE in gdb.base/catch-signal.exp by explicitly
giving names to the offending 'gdb_test "continue"' statements to make
them distinct.

Tested on x86_64-linux.

All beedback are welcome.

---
 gdb/testsuite/gdb.base/catch-signal.exp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.base/catch-signal.exp
index 00cad1b009a..6569e0c4c55 100644
--- a/gdb/testsuite/gdb.base/catch-signal.exp
+++ b/gdb/testsuite/gdb.base/catch-signal.exp
@@ -39,7 +39,7 @@ proc test_catch_signal {signame} {
 	gdb_test "handle SIGHUP nostop noprint pass" \
 	    "SIGHUP.*No.*No.*Yes.*"
 	gdb_test "catch signal" "Catchpoint .*"
-	gdb_test "continue" "Catchpoint .*"
+	gdb_test "continue" "Catchpoint .*" "continue to first HUP"
 
 	# Now ensure that the "pass" setting worked, and also that we did not
 	# see gdb's SIGTRAP.
@@ -52,7 +52,7 @@ proc test_catch_signal {signame} {
 	gdb_breakpoint ${srcfile}:[gdb_get_line_number "second HUP"]
 	gdb_continue_to_breakpoint "second HUP"
 	gdb_test "catch signal $signame" "Catchpoint .*"
-	gdb_test "continue" "Catchpoint .*"
+	gdb_test "continue" "Catchpoint .*" "continue to catch signal $signame"
 	delete_breakpoints
 
 	# Catch just SIGUSR1 -- but it isn't sent.
@@ -83,7 +83,6 @@ proc test_catch_signal {signame} {
 	    y
 	gdb_test "catch signal SIGINT" "Catchpoint .*"
 	gdb_test "continue" "Catchpoint .* SIGINT.*"
-        
     }
 }
 
-- 
2.33.1

Re: [PATCH] gdb/testsuite: Remove duplicates in gdb.base/catch-signal.exp

[Andrew Burgess]

* Lancelot SIX via Gdb-patches <gdb-patches@sourceware.org> [2021-11-19 17:52:38 +0000]:

> When running the testsuite I have the following:
> 
>     Running .../gdb/testsuite/gdb.base/catch-signal.exp ...
>     DUPLICATE: gdb.base/catch-signal.exp: SIGHUP: continue
>     DUPLICATE: gdb.base/catch-signal.exp: SIGHUP: continue
>     DUPLICATE: gdb.base/catch-signal.exp: 1: continue
>     DUPLICATE: gdb.base/catch-signal.exp: 1: continue
>     DUPLICATE: gdb.base/catch-signal.exp: SIGHUP SIGUSR2: continue
>     DUPLICATE: gdb.base/catch-signal.exp: SIGHUP SIGUSR2: continue
> 
> This patch removes DUPLICATE in gdb.base/catch-signal.exp by explicitly
> giving names to the offending 'gdb_test "continue"' statements to make
> them distinct.
> 
> Tested on x86_64-linux.
> 
> All beedback are welcome.

LGTM.

Thanks,
Andrew

> 
> ---
>  gdb/testsuite/gdb.base/catch-signal.exp | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.base/catch-signal.exp
> index 00cad1b009a..6569e0c4c55 100644
> --- a/gdb/testsuite/gdb.base/catch-signal.exp
> +++ b/gdb/testsuite/gdb.base/catch-signal.exp
> @@ -39,7 +39,7 @@ proc test_catch_signal {signame} {
>  	gdb_test "handle SIGHUP nostop noprint pass" \
>  	    "SIGHUP.*No.*No.*Yes.*"
>  	gdb_test "catch signal" "Catchpoint .*"
> -	gdb_test "continue" "Catchpoint .*"
> +	gdb_test "continue" "Catchpoint .*" "continue to first HUP"
>  
>  	# Now ensure that the "pass" setting worked, and also that we did not
>  	# see gdb's SIGTRAP.
> @@ -52,7 +52,7 @@ proc test_catch_signal {signame} {
>  	gdb_breakpoint ${srcfile}:[gdb_get_line_number "second HUP"]
>  	gdb_continue_to_breakpoint "second HUP"
>  	gdb_test "catch signal $signame" "Catchpoint .*"
> -	gdb_test "continue" "Catchpoint .*"
> +	gdb_test "continue" "Catchpoint .*" "continue to catch signal $signame"
>  	delete_breakpoints
>  
>  	# Catch just SIGUSR1 -- but it isn't sent.
> @@ -83,7 +83,6 @@ proc test_catch_signal {signame} {
>  	    y
>  	gdb_test "catch signal SIGINT" "Catchpoint .*"
>  	gdb_test "continue" "Catchpoint .* SIGINT.*"
> -        
>      }
>  }
>  
> -- 
> 2.33.1
> 

Re: [PATCH] gdb/testsuite: Remove duplicates in gdb.base/catch-signal.exp

[Lancelot SIX]

On Fri, Nov 19, 2021 at 07:04:16PM +0000, Andrew Burgess wrote:
> * Lancelot SIX via Gdb-patches <gdb-patches@sourceware.org> [2021-11-19 17:52:38 +0000]:
> 
> > When running the testsuite I have the following:
> > 
> >     Running .../gdb/testsuite/gdb.base/catch-signal.exp ...
> >     DUPLICATE: gdb.base/catch-signal.exp: SIGHUP: continue
> >     DUPLICATE: gdb.base/catch-signal.exp: SIGHUP: continue
> >     DUPLICATE: gdb.base/catch-signal.exp: 1: continue
> >     DUPLICATE: gdb.base/catch-signal.exp: 1: continue
> >     DUPLICATE: gdb.base/catch-signal.exp: SIGHUP SIGUSR2: continue
> >     DUPLICATE: gdb.base/catch-signal.exp: SIGHUP SIGUSR2: continue
> > 
> > This patch removes DUPLICATE in gdb.base/catch-signal.exp by explicitly
> > giving names to the offending 'gdb_test "continue"' statements to make
> > them distinct.
> > 
> > Tested on x86_64-linux.
> > 
> > All beedback are welcome.
> 
> LGTM.
> 
> Thanks,
> Andrew
> 
Thanks,

I have just pushed this patch.

Lancelot.