From b9132588e0c9409b9bf48fd76c72e6efeaa90d5a Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Thu, 23 Jun 2011 09:40:50 +0000 Subject: [PATCH] Fix races in mi2-console.exp. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.mi/mi2-console.exp | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1aabd7c9e8..3b84b69564 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-06-23 Marek Polacek + + * gdb.mi/mi2-console.exp: Replace gdb_test_multiple with mi_gdb_test. + 2011-06-23 Marek Polacek * gdb.mi/mi2-basics.exp: Fix races. Honour the diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp index 0d052560aa..29a44228e4 100644 --- a/gdb/testsuite/gdb.mi/mi2-console.exp +++ b/gdb/testsuite/gdb.mi/mi2-console.exp @@ -48,11 +48,8 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb mi_run_to_main # Next over the hello() call which will produce lots of output -gdb_test_multiple "220-exec-next" "Started step over hello" { - -re "220\\^running\r\n(\\*running,thread-id=\"all\"\r\n)?$mi_gdb_prompt" { - pass "Started step over hello" - } -} +mi_gdb_test "220-exec-next" "220\\^running(\r\n)?(\\*running,thread-id=\"all\")?" \ + "Started step over hello" if { ![target_info exists gdb,noinferiorio] } { gdb_expect { -- 2.34.1