2001-03-12 Michael Chastain <chastain@redhat.com>

	* gdb.c++/derivation.exp: Use the 'runto' library function.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f4086d875f3884363af39afb7cd2b894f1120e29..06fcb63cb8854cb07dfc46830f161863ad66e8e7 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-12  Michael Chastain  <chastain@redhat.com>
+
+       * gdb.c++/derivation.exp: Use the 'runto' library function.
+
 2001-03-12  Michael Chastain  <chastain@redhat.com>
 
        * gdb.c++/annota2.exp: Fix regular expression for "post-query".

diff --git a/gdb/testsuite/gdb.c++/derivation.exp b/gdb/testsuite/gdb.c++/derivation.exp
index 00df5c06d3a6aed5e6896561c58776f0c1b12e76..13501f2f4d50bf58a2d4dd02311f3fd92d544ea4 100644 (file)
--- a/gdb/testsuite/gdb.c++/derivation.exp
+++ b/gdb/testsuite/gdb.c++/derivation.exp
@@ -1,4 +1,4 @@
-# Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,25 +69,12 @@ if ![runto_main] then {
     continue
 }
 
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
-            send_gdb "up\n"
-            gdb_expect {
-                -re ".*main.*$gdb_prompt $" {
-                   pass "up from marker1"
-               }
-                -re ".*$gdb_prompt $" {
-                   fail "up from marker1"
-               }
-                timeout { fail "up from marker1 (timeout)" }
-            }
-        }
-        -re "$gdb_prompt $" { fail "continue to marker1"  }
-        timeout { fail "(timeout) continue to marker1"  }
-    }
+if ![runto 'marker1'] then {
+    perror "couldn't run to marker1"
+    continue
+}
+
+gdb_test "up" ".*main.*" "up from marker1"