diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 72c54ec567..752a4621b4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,34 @@
+Thu Mar 25 12:14:28 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* config/udi-gdb.exp (gdb_exit): Remove close command.
+	(gdb_target_udi): New procedure to set the UDI target.
+	(gdb_start): Don't remove *_soc files.  Use gdb_target_udi.
+	* gdb.t00/default.exp: Added expected failures for a29k-*-udi.
+	Added waits for prompts after several question responses.  Added
+	some more responses used by a29k-amd-udi-gdb.
+	* gdb.t01/run.exp, gdb.t06/break.exp: Added a29k-*-udi support:
+	pass different arguments, restart UDI connection after program
+	completion.
+	* gdb.t02/whatis.exp, gdb.t03/ptype.exp, gdb.t07/watchpoint.exp,
+	gdb.t08/opaque.exp, gdb.t11/list.exp, gdb.t12/scope.exp,
+	gdb.t15/funcargs.exp, gdb.t16/printcmds.exp, gdb.t20/misc.exp,
+	gdb.t21/cplusfuncs.exp: Added expected failures for a29k-*-*.
+	* gdb.t04/setvar.exp, gdb.t05/expr.exp, gdb.t07/watchpoint.exp,
+	gdb.t08/opaque.exp, gdb.t12/scope.exp, gdb.t13/bitfields.exp,
+	gdb.t15/funcargs.exp, gdb.t16/printcmds.exp,
+	gdb.t17/callfuncs.exp, gdb.t20/classes.exp, gdb.t20/inherit.exp,
+	gdb.t20/misc.exp, gdb.t22/virtfuncs.exp: Restart UDI connection
+	after program completion.
+	* gdb.t10/crossload.exp: Does not work for a29k-*-*, since BFD is
+	compiled with a SELECT_VECS setting.
+	* gdb.t15/funcargs.exp: Use argument to backtrace to prevent
+	infinite recursion.
+
+	* gdb.t20/classes.exp, gdb.t20/inherit.exp, gdb.t22/virtfuncs.exp:
+	Added checks for COFF results, and made them expected failures for
+	all targets.  It would be better to make them expected failures
+	for COFF targets only.
+
 Wed Mar 24 14:43:38 1993  david d `zoo' zuhn  (zoo at poseidon.cygnus.com)
 
 	* Makefile.in: add null dvi target, don't bother to recurse
diff --git a/gdb/testsuite/config/udi-gdb.exp b/gdb/testsuite/config/udi-gdb.exp
index ab7eecd590..2b5ba153d3 100644
--- a/gdb/testsuite/config/udi-gdb.exp
+++ b/gdb/testsuite/config/udi-gdb.exp
@@ -117,7 +117,36 @@ proc gdb_exit {} {
     if $verbose>1 then {
 	send_user "Quitting $GDB $GDBFLAGS\n"
     }
-    close
+}
+
+#
+# gdb_target_udi
+# Set gdb to the desired UDI target
+#
+proc gdb_target_udi { } {
+    global targetname
+    global prompt
+    global verbose
+
+    # set targets hostname
+    send "target udi $targetname\n"
+    set timeout 60
+    expect {
+	-re "TIP UDI 1.2 Conformant.*$prompt $"	{
+	    if $verbose>1 then {
+		send_user "Set target to $targetname\n"
+	    }
+	}
+	-re "A program is being debugged already.  Kill it\? \(y or n\)" {
+	    send "y\n"
+	    continue -expect
+	}
+	timeout { 
+	    error "Couldn't set target for UDI."
+	    alldone
+	}
+    }
+    set timeout 10
 }
 
 #
@@ -130,7 +159,6 @@ proc gdb_start { } {
     global spawn_id
     global prompt
     global verbose
-    global targetname
 
     set GDB [which $GDB]
     # start GDB
@@ -164,24 +192,8 @@ proc gdb_start { } {
     if $verbose>1 then {
 	send_user "Setting up target, Please wait...\n"
     }
-    catch "exec rm [glob -nocomplain *_soc]"
-    catch "exec rm [glob -nocomplain /tmp/*_soc]"
-    # set targets hostname
-    send "target udi $targetname\n"
-    set timeout 60
-    expect {
-	-re "target udi.*TIP UDI 1.2 Conformant.*$prompt $"	{
-	    if $verbose>1 then {
-		send_user "Set target to $targetname\n"
-	    }
-}
-	timeout { 
-	    error "Couldn't set target for vxworks."
-	    set timeout 10
-	    return -1
-	}
-    }
-    set timeout 10
+
+    gdb_target_udi
 }
 
 expect_after {