after gdb_run_cmd, gdb_expect -> gdb_test_multiple/gdb_test

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

diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
index 74eb3063e8595f59acca8d7a9296fa5aff61235b..ef8605978b1281cd1e1fb6d77e5c2fd7c095ba0f 100644 (file)
--- a/gdb/testsuite/gdb.base/commands.exp
+++ b/gdb/testsuite/gdb.base/commands.exp
@@ -493,16 +493,7 @@ proc bp_deleted_in_command_test {} {
        "end commands"
 
     gdb_run_cmd
-    gdb_expect {
-        -re ".*factorial command-list executed.*$gdb_prompt $" {
-           pass "run factorial until breakpoint"
-        }
-       -re ".*$gdb_prompt $" {
-           fail "run factorial until breakpoint"
-       }
-       default { fail "(timeout) run factorial until breakpoint" }
-       timeout { fail "(timeout) run factorial until breakpoint" }
-    }
+    gdb_test "" "factorial command-list executed.*" "run factorial until breakpoint"
 }
 
 proc temporary_breakpoint_commands {} {
@@ -551,12 +542,8 @@ proc temporary_breakpoint_commands {} {
        "end tbreak commands"
 
     gdb_run_cmd
-    gdb_expect {
-       -re ".*factorial tbreak commands executed.*$gdb_prompt $" {
-           pass "run factorial until temporary breakpoint"
-       }
-       timeout { fail "(timeout) run factorial until temporary breakpoint" }
-    }
+    gdb_test "" "factorial tbreak commands executed.*" \
+       "run factorial until temporary breakpoint"
 }
 
 # Test that GDB can handle $arg0 outside of user functions without