* 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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d5a580960ee12943b90628f3d0faae4f18c82816..cde27de1f2829c4e1389d30f13344fb219649d29 100644 (file)
--- 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 0a78b3117c14eeff97eadc5f4d499c61f9716bc0..e12ed6f2f2a3f7dbfb7baa6dcc18f59b25ba8566 100644 (file)
--- 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.