Re: [PATCH 20/25] Tighten gdb.threads/no-unwaited-for-left.exp regexps

[Pedro Alves <pedro@palves.net>]

This one is I think pretty much unobjectionable, so I went ahead and merged it, to
avoid reposting it in a v2 of the series.  (I replaced the "following patch" wording in
the commit log.)

Pedro Alves

On 2022-06-20 11:54 p.m., Pedro Alves wrote:
> A WIP version of the following patch resulted in a bug that went
> unnoticed by the testuite, like so:
> 
>  (gdb) PASS: gdb.threads/no-unwaited-for-left.exp: enable scheduler-locking, for main thread
>  continue
>  Continuing.
>  [New Thread 1251861.1251861]
>  No unwaited-for children left.
>  (gdb) PASS: gdb.threads/no-unwaited-for-left.exp: continue stops when the main thread exits
>  info threads
>    Id   Target Id                                Frame
>    3    Thread 1251861.1251863 "no-unwaited-for" __pthread_clockjoin_ex (threadid=140737351558976, thread_return=0x0, clockid=<optimized out>, abstime=<optimized out>, block=<optimized out>) at pthread_join_common.c:145
>    4    Thread 1251861.1251861 "no-unwaited-for" <unavailable> in ?? ()
> 
>  The current thread <Thread ID 1> has terminated.  See `help thread'.
>  (gdb) PASS: gdb.threads/no-unwaited-for-left.exp: only thread 3 left, main thread terminated
> 
> Somehow, above, GDB re-added the zombie leader back before printing
> "No unwaited-for children left.".  The "only thread 3 left, main
> thread terminated" test should have caught this, but didn't.  That is
> because the test's regexp has a ".*" after the part that matches
> thread 3.  This commit tightens that regexp to catch such a bug.  It
> also tightens the "only main thread left, thread 2 terminated" test's
> regexp in the same way.
> 
> Change-Id: I8744f327a0aa0e2669d1ddda88247e99b91cefff
> ---
>  gdb/testsuite/gdb.threads/no-unwaited-for-left.exp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp b/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
> index cfeb495594d..6773aa46d71 100644
> --- a/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
> +++ b/gdb/testsuite/gdb.threads/no-unwaited-for-left.exp
> @@ -42,7 +42,7 @@ gdb_test "continue" \
>      "continue stops when thread 2 exits"
>  
>  gdb_test "info threads" \
> -	 "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n *1 *Thread \[^\r\n\]* \[^\r\n\]*.*The current thread <Thread ID 2> has terminated.*" \
> +	 "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n *1 *Thread \[^\r\n\]* \[^\r\n\]*\[\r\n\]*The current thread <Thread ID 2> has terminated.*" \
>  	 "only main thread left, thread 2 terminated"
>  
>  # Select the main thread, let the third thread start, and stop at the
> @@ -63,7 +63,7 @@ gdb_test "continue" \
>      "continue stops when the main thread exits"
>  
>  gdb_test "info threads" \
> -	 "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n *3 *Thread \[^\r\n\]* \[^\r\n\]*.*The current thread <Thread ID 1> has terminated.*" \
> +	 "\r\n\[ \t\]*Id\[ \t\]+Target\[ \t\]+Id\[ \t\]+Frame\[ \t\]*\r\n *3 *Thread \[^\r\n\]* \[^\r\n\]*\[\r\n\]*The current thread <Thread ID 1> has terminated.*" \
>  	 "only thread 3 left, main thread terminated"
>  
>  # Make sure thread apply all works when we have exited threads in the
>