Re: [PATCH] gdb.mi/mi-nonstop.exp: fix racy tests (PR testsuite/12649)

[Pedro Alves <pedro at codesourcery dot com>]

On Friday 27 May 2011 15:06:51, Marek Polacek wrote:
> On 05/26/2011 06:32 PM, Pedro Alves wrote:
> [...]
> 
> Another take, now with the mi_gdb_test and the mi_expect_interrupt.
> Tested with both read{,1}.  Ok?

Yes, thanks.

> 
> 2011-05-27  Marek Polacek  <mpolacek@redhat.com>
> 
>         * gdb.mi/mi-nonstop.exp: Replace gdb_test_multiple with mi_gdb_test.
> 
> --- gdb/gdb/testsuite/gdb.mi/mi-nonstop.exp.mp  2011-05-27 14:36:57.000000000 +0200
> +++ gdb/gdb/testsuite/gdb.mi/mi-nonstop.exp     2011-05-27 15:54:27.063216883 +0200
> @@ -81,22 +81,17 @@ mi_varobj_update * {I_W1 I_W0} "update v
>  mi_check_varobj_value I_W0 1 "check varobj, w0, 1"
>  mi_check_varobj_value I_W1 1 "check varobj, w1, 1"
>  
> -gdb_test_multiple "-exec-interrupt --thread 1" "interrupted" {
> -    -re "\\^done\r\n$mi_gdb_prompt\\*stopped\[^\r\n\]+\r\n$" {
> -       pass "interrupted"
> -    }
> -}
> +mi_gdb_test "-exec-interrupt --thread 1" "\\^done"  "interrupted"
> +mi_expect_interrupt "got interrupt"
> +
>  # The interrupt command sends SIGINT to the target, and therefore the 
>  # thread might not be stopped immediately when we return from the target.
>  # So, wait a bit 
>  sleep 1
>  mi_check_thread_states {"stopped" "stopped" "stopped"} "thread state, stop 4"
>  
> -gdb_test_multiple "-exec-continue --all" "resume all" {
> -    -re ".*\\*running,thread-id=\"3\"\r\n\\*running,thread-id=\"2\"\r\n\\*running,thread-id=\"1\"\r\n$mi_gdb_prompt" {
> -       pass "resume all"
> -    }
> -}
> +mi_gdb_test "-exec-continue --all" ".*\\*running,thread-id=\"3\"\r\n\\*running,thread-id=\"2\"\r\n\\*running,thread-id=\"1\"" \
> +    "resume all"
>  
>  mi_expect_stop "breakpoint-hit" "break_at_me" "\[^\n\]*" "non-stop.c" "\[0-9\]*" {"" "disp=\"keep\""} "w0,i2 stop"
>  mi_expect_stop "breakpoint-hit" "break_at_me" ".*" "non-stop.c" ".*" {"" "disp=\"keep\""} "w1,i2 stop"
> 

-- 
Pedro Alves