aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorMarek Polacek <mpolacek@sourceware.org>2011-06-23 09:40:50 +0000
committerMarek Polacek <mpolacek@sourceware.org>2011-06-23 09:40:50 +0000
commitb9132588e0c9409b9bf48fd76c72e6efeaa90d5a (patch)
treed851efd31020fc373607bf36d046436498e65080 /gdb
parente55595cad56bca2abd5caf9f089f6d33906d19d4 (diff)
downloadfsf-binutils-gdb-b9132588e0c9409b9bf48fd76c72e6efeaa90d5a.zip
fsf-binutils-gdb-b9132588e0c9409b9bf48fd76c72e6efeaa90d5a.tar.gz
fsf-binutils-gdb-b9132588e0c9409b9bf48fd76c72e6efeaa90d5a.tar.bz2
Fix races in mi2-console.exp.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.mi/mi2-console.exp7
2 files changed, 6 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1aabd7c..3b84b69 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2011-06-23 Marek Polacek <mpolacek@redhat.com>
+ * gdb.mi/mi2-console.exp: Replace gdb_test_multiple with mi_gdb_test.
+
+2011-06-23 Marek Polacek <mpolacek@redhat.com>
+
* gdb.mi/mi2-basics.exp: Fix races. Honour the
`test_exec_and_symbol_mi_operatons' return value.
(test_mi_interpreter_selection): Use mi_gdb_test instead of
diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp
index 0d05256..29a4422 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 {