after gdb_run_cmd, gdb_expect -> gdb_test_multiple/gdb_test

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.arch / gdb1558.exp

diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp
index 42bb277379bea9e24e7273fca2610a1f511b988f..3f07a64975fdad1a58b6d135b61c404366eade62 100644 (file)
--- a/gdb/testsuite/gdb.arch/gdb1558.exp
+++ b/gdb/testsuite/gdb.arch/gdb1558.exp
@@ -50,17 +50,12 @@ gdb_test "b sub2" "Breakpoint 3.*" "set breakpoint at sub2"
 
 gdb_run_cmd
 
-gdb_expect 30 {
+set test "Hits breakpoint at main after function called from main"
+gdb_test_multiple "" $test {
     -re "Breakpoint 1.*main .*$gdb_prompt $" {
-       pass "Hits breakpoint at main after function called from main"
+       pass $test
     }
     -re "Breakpoint 2.*sub1 .*$gdb_prompt $" {
-       kfail "gdb/1558" "Hits breakpoint at main after function called from main"
-    }
-    -re "$gdb_prompt $" { 
-       fail "Hits breakpoint at main after function called from main"
-    }
-    timeout { 
-       fail "Hits breakpoint at main after function called from main (timeout)"
+       kfail "gdb/1558" $test
     }
 }