Temporarily back out last change

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 664aff284c43f8a475826423613ff53c75cb6063..2a967a2d70d40e8f019cbd2f9f4dfd695e955095 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -159,9 +159,14 @@ proc runto { function } {
        timeout { fail "setting breakpoint at $function (timeout)" ; return 0 }
     }
 
+    send "run\n"
     # the "at foo.c:36" output we get with -g.
     # the "in func" output we get without -g.
-    expect_after {
+    expect {
+       -re "The program .* has been started already.*y or n. $" {
+           send "y\n"
+           exp_continue
+       }
        -re "Starting.*Break.* at .*:$decimal.*$prompt $" { return 1 }
        -re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in $function.*$prompt $" { 
            return 1
@@ -169,8 +174,6 @@ proc runto { function } {
        -re "$prompt $" { fail "running to $function" ; return 0 }
        timeout { fail "running to $function (timeout)" ; return 0 }
     }
-    gdb_run_cmd
-    expect_after;
 }
 
 #