after gdb_run_cmd, gdb_expect -> gdb_test_multiple/gdb_test

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / dbx.exp

diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp
index 06638c7a7506e18cd4d7a82f235394b93f8fba9b..4383e79573cb089bcf9b5f33b276adfcca42c6e8 100644 (file)
--- a/gdb/testsuite/gdb.base/dbx.exp
+++ b/gdb/testsuite/gdb.base/dbx.exp
@@ -258,11 +258,14 @@ proc test_assign { } {
     global gdb_prompt
 
     gdb_run_cmd
-    gdb_expect 30 {
-        -re "Break.* at .*:$decimal.*$gdb_prompt $" { pass "running to main" }
-        -re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in .*$gdb_prompt $" { pass "running to main"  }
-        -re "$gdb_prompt $" { fail "running to main" }
-        timeout { fail "running to main (timeout)" }
+    set test "running to main"
+    gdb_test_multiple "" $test {
+        -re "Break.* at .*:$decimal.*$gdb_prompt $" {
+           pass $test
+       }
+        -re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in .*$gdb_prompt $" {
+           pass $test
+       }
     }
     send_gdb "assign first=1\n"
     gdb_expect {