From 2558ba5dd651c733b86b9ea4320d6ea091ee9d71 Mon Sep 17 00:00:00 2001
From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Mon, 7 Feb 1994 01:50:51 +0000
Subject: [PATCH] 	* config/udi-gdb.exp (gdb_load): Use "file", not
 "load" command, 	since "run" automatically loads if necessary.  Call
 gdb_target_udi 	after the "file" since "file" kills any execution
 target.

---
 gdb/testsuite/ChangeLog          |  5 ++++-
 gdb/testsuite/config/udi-gdb.exp | 30 ++++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d5a580960ee..cde27de1f28 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 Sun Feb  6 15:36:13 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+	* gdb.t03/ptype.exp: For UDI, skip tests which call malloc.
+
 	* gdb.t02/whatis.exp: Remove xfails for PRs 1838 and 2417; they
 	are fixed.
 
@@ -13,7 +15,8 @@ Sun Feb  6 15:36:13 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 	* gdb.t01/run.exp: Only run shell test if isnative.
 
 	* config/udi-gdb.exp (gdb_load): Use "file", not "load" command,
-	since "run" automatically loads if necessary.
+	since "run" automatically loads if necessary.  Call gdb_target_udi
+	after the "file" since "file" kills any execution target.
 
 	* config/udi-gdb.exp (gdb_start): Don't send "set args main" to
 	GDB.  GDB doesn't work that way (not anymore at least) on UDI.
diff --git a/gdb/testsuite/config/udi-gdb.exp b/gdb/testsuite/config/udi-gdb.exp
index 0a78b3117c1..e12ed6f2f2a 100644
--- a/gdb/testsuite/config/udi-gdb.exp
+++ b/gdb/testsuite/config/udi-gdb.exp
@@ -41,20 +41,6 @@ proc gdb_version {} {
     default_gdb_version
 }
 
-#
-# gdb_load -- load a file into the debugger.
-#             return a -1 if anything goes wrong.
-#
-proc gdb_load { arg } {
-    global verbose
-    global loadpath
-    global loadfile
-    global GDB
-    global prompt
-
-    return [gdb_file_cmd $arg]
-}
-
 #
 # gdb_target_udi
 # Set gdb to the desired UDI target
@@ -94,6 +80,22 @@ proc gdb_target_udi { } {
     set timeout 10
 }
 
+#
+# gdb_load -- load a file into the debugger.
+#             return a -1 if anything goes wrong.
+#
+proc gdb_load { arg } {
+    global verbose
+    global loadpath
+    global loadfile
+    global GDB
+    global prompt
+
+    if [gdb_file_cmd $arg] then { return -1 }
+
+    gdb_target_udi
+}
+
 #
 # gdb_start -- start GDB running. This assumes that there the
 #              UDICONF enviroment variable is set.
-- 
2.30.2