2001-02-24 Michael Chastain <chastain@redhat.com>

* gdb.c++/ref-types.exp: Change handwritten code to library
	function 'runto'.

gdb/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2001-02-24  Michael Chastain  <chastain@redhat.com>
+
+	* gdb.c++/ref-types.exp: Change handwritten code to library
+	function 'runto'.
+
 2001-03-16  Orjan Friberg  <orjanf@axis.com>
 
 	* gdb.base/signals.exp: Set count to 0 explicitly.

gdb/testsuite/gdb.c++/ref-types.exp

@@ -54,73 +54,44 @@ if ![runto_main] then {
     continue
 }
 
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
+if ![runto 'marker1'] then {
-
+    perror "couldn't run to marker1"
-    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"  }
-    }
-
-
-proc gdb_start_again {} {
-global srcdir
-global subdir
-global binfile
-global gdb_prompt
-global decimal
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-source ${binfile}.ci
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
     continue
 }
 
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
+gdb_test "up" ".*main.*" "up from marker1 1"
 
-    send_gdb "cont\n"
+proc gdb_start_again {} {
-    gdb_expect {
+    global srcdir
-        -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
+    global subdir
-            send_gdb "up\n"
+    global binfile
-            gdb_expect {
+    global gdb_prompt
-                -re ".*main.*$gdb_prompt $" {
+    global decimal
-		    pass "up from marker1"
+
-		}
+    gdb_start
-                -re ".*$gdb_prompt $" {
+    gdb_reinitialize_dir $srcdir/$subdir
-		    fail "up from marker1"
+    gdb_load ${binfile}
-		}
+
-                timeout { fail "up from marker1 (timeout)" }
+    source ${binfile}.ci
-            }
+
-        }
+    #
-        -re "$gdb_prompt $" { fail "continue to marker1"  }
+    # set it up at a breakpoint so we can play with the variable values
-        timeout { fail "(timeout) continue to marker1"  }
+    #
+    if ![runto_main] then {
+	perror "couldn't run to breakpoint"
+	continue
     }
+
+    if ![runto 'marker1'] then {
+	perror "couldn't run to marker1"
+	continue
+    }
+
+    gdb_test "up" ".*main.*" "up from marker1 2"
 }
 
 
 
-
-
 send_gdb "print s\n"
 gdb_expect {
     -re ".\[0-9\]* = -1.*$gdb_prompt $" {
@@ -290,26 +261,12 @@ gdb_expect {
   }
 
 
-send_gdb "break f\n" ; gdb_expect -re ".*$gdb_prompt $"
+if ![runto 'f'] then {
-
+    perror "couldn't run to f"
-    send_gdb "cont\n"
+    continue
-    gdb_expect {
+}
-        -re "Break.* f \\(\\) at .*:$decimal.*$gdb_prompt $" {
-            send_gdb "up\n"
-            gdb_expect {
-                -re ".*main2.*$gdb_prompt $" {
-		    pass "up from f" 
-		}
-                -re ".*$gdb_prompt $" {
-		    fail "up from f" 
-		}
-                timeout { fail "up from f (timeout)" }
-            }
-        }
-        -re "$gdb_prompt $" { fail "continue to f"  }
-        timeout { fail "(timeout) continue to f"  }
-    }
 
+gdb_test "up" ".main2.*" "up from f"
 
 send_gdb "print C\n"
 gdb_expect {