Re: [PATCH] Fix for the gdb.base/sigstep.exp test.

[Tom de Vries <tdevries@suse.de>]

On 11/12/21 5:52 PM, Carl Love wrote:
> Tom:
> 
> I updated the commit log as suggested and removed the unused variable
> set from the patch.  The patch has been retested on PowerPC and X86.
> 
> I beleve I have fixed all of your comments on the patch.  Thank you for
> your feedback and input to improve the patch.
> 
> Please let me know if this is now acceptable for committing to
> mainline.
> 

Ok for committing to mainline, thanks for working on this.  I'm looking
forward to seeing the FAIL count drop yet further :)

Thanks,
- Tom


>                 Carl 
> 
> -----------------------------------------------------------------
> 
> Fix gdb.base/sigstep.exp test for ppc
> 
> The test stops at <signal_handler called> which is the call to the handler
> rather than in the handler as intended.  This patch replaces the
> gdb_test "$enter_cmd to handler" with a gdb_test_multiple test.  The multiple
> test looks for the stop at <signal_handler called>.  If found, the command
> is issued again.  The test passes if gdb stops in the handler as expected.
> 
> 
> (gdb) PASS: gdb.base/sigstep.exp: stepi to handler, nothing in handler, step
> from handler: continue to signal
> stepi
> <signal handler called>
> 1: x/i $pc
> => 0x7ffff7f80440 <__kernel_start_sigtramp_rt64>:       bctrl
> (gdb) stepi
> handler (sig=551) at sigstep.c:32
> 32      {
> 1: x/i $pc
> => 0x10000097c <handler>:       addis   r2,r12,2
> (gdb) PASS: gdb.base/sigstep.exp: stepi to handler, nothing in handler,
> step from handler: stepi to handler
> 
> Patch has been tested on x86_64-linux and ppc64le-linux with no test failures.
> 
> ---
>  gdb/testsuite/gdb.base/sigstep.exp | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp
> index ea254af5297..176918b67d6 100644
> --- a/gdb/testsuite/gdb.base/sigstep.exp
> +++ b/gdb/testsuite/gdb.base/sigstep.exp
> @@ -79,6 +79,7 @@ validate_backtrace
>  proc advance { enter_cmd in_handler_prefix in_handler exit_cmd } {
>      global gdb_prompt inferior_exited_re
>      global clear_done other_handler_location
> +    global decimal
>  
>      set prefix "$enter_cmd to handler, $in_handler_prefix in handler, $exit_cmd from handler"
>  
> @@ -93,7 +94,16 @@ proc advance { enter_cmd in_handler_prefix in_handler exit_cmd } {
>  	    gdb_test "handle SIGVTALRM print pass stop"
>  	    gdb_test "continue" "Program received signal.*" "continue to signal"
>  	}
> -	gdb_test "$enter_cmd" ".*handler .*" "$enter_cmd to handler"
> +
> +	gdb_test_multiple "$enter_cmd" "$enter_cmd to handler" {
> +	    -re -wrap "\r\n<signal handler called>.*" {
> +		send_gdb "$enter_cmd\n"
> +		exp_continue
> +	    }
> +	    -re -wrap "\r\n(Breakpoint $decimal, )?handler \\(sig=.*" {
> +		pass $gdb_test_name
> +	    }
> +	}
>  
>  	delete_breakpoints
>  
>