From d0b1d6240c1cdc8d4052b5e2177f45313f7b5949 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Wed, 22 Jun 2011 15:38:00 +0000 Subject: [PATCH] Fix races in gdb.mi/mi-nsmoribund.exp. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.mi/mi-nsmoribund.exp | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 70ea0cd50e7..fdc131c5547 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-06-20 Marek Polacek + + * gdb.mi/mi-nsmoribund.exp: Replace gdb_test_multiple with + mi_gdb_test. + 2011-06-20 Marek Polacek * gdb.mi/mi-return.exp: Replace gdb_test_multiple with mi_gdb_test. diff --git a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp index 09fbe6fea73..33b1ac3b4b5 100644 --- a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp +++ b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp @@ -82,15 +82,14 @@ mi_create_breakpoint "-p 5 $srcfile:$bkpt_line" 3 keep thread_function .* .* .* # Resume all threads. Only thread 5 should report a stop. set running_re "" -for {set i $nthreads} {$i > 0} {incr i -1} { +for {set i $nthreads} {$i > 1} {incr i -1} { set running_re "$running_re\\*running,thread-id=\"$decimal\"\r\n" } +# Don't append \r\n after last line. +set running_re "$running_re\\*running,thread-id=\"$decimal\"" -gdb_test_multiple "-exec-continue --all" "resume all, thread specific breakpoint" { - -re ".*$running_re$mi_gdb_prompt" { - pass "resume all, thread specific breakpoint" - } -} +mi_gdb_test "-exec-continue --all" "\[^\n\]*\r\n$running_re" \ + "resume all, thread specific breakpoint" mi_expect_stop "breakpoint-hit" "thread_function" "\[^\n\]*" "$srcfile" \ "\[0-9\]*" {"" "disp=\"keep\""} "hit thread specific breakpoint" -- 2.30.2