Wed Jun 8 12:12:17 1994 Stan Shebs (shebs@andros.cygnus.com)

	* config/udi-gdb.exp, config/unix-gdb.exp: Call default_gdb_start.
	* lib/gdb.exp (default_gdb_start): Define.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8230dd5c10b101d888cc13eb0ea4cbaedca151da..d5444aeef018c772c1724b11a213fce15b88a509 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+Wed Jun  8 12:12:17 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+       * config/udi-gdb.exp, config/unix-gdb.exp: Call default_gdb_start.
+       * lib/gdb.exp (default_gdb_start): Define.
+       * gdb.base/bitfields.exp, gdb.base/break.exp, gdb.base/exprs.exp,
+       gdb.base/funcargs.exp, gdb.base/opaque.exp,
+       gdb.base/printcmds.exp, gdb.base/ptype.exp, gdb.base/recurse.exp,
+       gdb.base/scope.exp, gdb.base/setvar.exp, gdb.base/watchpoint.exp,
+       gdb.c++/classes.exp, gdb.c++/misc.exp, gdb.c++/virtfunc.exp:
+       Don't call gdb_target_udi in between tests.
+
 Tue Jun  7 08:30:15 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
        * gdb.c++/demangle.exp: Use gdb_test_exact, rather than demangle

diff --git a/gdb/testsuite/config/udi-gdb.exp b/gdb/testsuite/config/udi-gdb.exp
index 5d44efcb383ab3caa7c7b126d2aca008064eef1d..09144465ff16c8579a2565632e1e4c28f2ca3c8a 100644 (file)
--- a/gdb/testsuite/config/udi-gdb.exp
+++ b/gdb/testsuite/config/udi-gdb.exp
@@ -1,5 +1,5 @@
 # Test Framework Driver for GDB driving Universal Debug Interface on 29K
-#   Copyright 1988, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+#   Copyright 1988, 1990, 1991, 1992, 1993, 1994 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
@@ -24,13 +24,6 @@
 # NOTE: these test assume that there is a udi_soc file in th
 #
 
-# these need to be initialized only if site.exp doesn't set them
-set prompt "\(gdb\)"
-
-if ![info exists prompt] then {
-    set prompt "\(gdb\)"
-}
-
 load_lib gdb.exp
 load_lib udi.exp
 
@@ -101,42 +94,8 @@ proc gdb_load { arg } {
 #              UDICONF enviroment variable is set.
 #
 proc gdb_start { } {
-    global GDB
-    global GDBFLAGS
-    global spawn_id
-    global prompt
-    global verbose
-
-    set GDB [which $GDB]
-    # start GDB
-    if [ llength $GDBFLAGS ] then {
-       spawn $GDB $GDBFLAGS
-    } else {
-       spawn $GDB
-    }
-    expect  {
-       -re "GDB.*$prompt $"   {
-           verbose "$GDB initialized for cross mode\n"
-       }
-       -re "$prompt $" {
-           perror "GDB never initialized."
-           return -1
-       }
-       timeout {
-           perror "(timeout) GDB never initialized."    
-           return -1
-       }
-    }
-
-    # force the height to "unlimited", so no pagers get used
-    send "set height 0\n"
-    expect -re ".*$prompt $" {}
-    # force the width to "unlimited", so no wraparound occurs
-    send "set width 0\n"
-    expect -re ".*$prompt $" {}
-
+    default_gdb_start
     verbose "Setting up target, Please wait..."
-
     gdb_target_udi
 }
 

diff --git a/gdb/testsuite/config/unix-gdb.exp b/gdb/testsuite/config/unix-gdb.exp
index 1edda205831eec42f044065470d3d2a902dd5945..886a0e6188a2d430529f1c065fa5bf6a7c68e5a1 100644 (file)
--- a/gdb/testsuite/config/unix-gdb.exp
+++ b/gdb/testsuite/config/unix-gdb.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
+#   Copyright (C) 1988, 1990, 1991, 1992, 1994 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
@@ -60,72 +60,10 @@ proc gdb_load { arg } {
     return [gdb_file_cmd $arg]
 }
 
-#
-# start gdb -- start gdb running
-#
-
-proc gdb_start {} {
-    global verbose
-    global GDB
-    global GDBFLAGS
-    global prompt
-    global spawn_id
-    global timeout
-    verbose "Spawning $GDB $GDBFLAGS"
-    
-    set oldtimeout $timeout
-    set timeout [expr "$timeout + 60"]
-    if [ llength $GDBFLAGS ] then {
-       if {[which $GDB] != 0} then {
-           spawn $GDB $GDBFLAGS
-       } else {
-           perror "$GDB does not exist."
-           exit 1
-       }
-    } else {
-       if {[which $GDB] != 0} then {
-           spawn $GDB
-       } else {
-           perror "$GDB does not exist."
-           exit 1
-       }
-    }
-    expect {
-       -re ".*\r\n$prompt $" {
-           verbose "GDB initialized for native mode"
-       }
-       -re "$prompt $" {
-           perror "GDB never initialized."
-           return -1
-       }
-       timeout         {
-           perror "(timeout) GDB never initialized."
-           return -1
-       }
-    }
-    set timeout $oldtimeout
-    # force the height to "unlimited", so no pagers get used
-    send "set height 0\n"
-    expect {
-       -re ".*$prompt $" { 
-           verbose "Setting height to 0." 2
-       }
-       timeout {
-           warning "Couldn't set the height to 0."
-       }
-    }
-    # force the width to "unlimited", so no wraparound occurs
-    send "set width 0\n"
-    expect {
-       -re ".*$prompt $" {
-           verbose "Seting width to 0." 2
-       }
-       timeout {
-           warning "Couldn't set the width to 0."
-       }
-    }
+proc gdb_start { } {
+    default_gdb_start
 }
-
+  
 proc gdb_exit { } {
     catch default_gdb_exit
 }

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 35ac4e124c65835a5cc66efb3afd0ae0433450e8..9e42606fbd0bbe12202cc4339afd72cdf2d5e984 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1992 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1994 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
@@ -25,7 +25,7 @@
 
 global GDB
 if ![info exists GDB] then {
-    set GDB [transform gdb]
+    set GDB [findfile $base_dir/../gdb "gdb" [transform gdb ]]
 }
 
 global GDBFLAGS
@@ -395,6 +395,71 @@ oaded."
     }
 }
 
+#
+# start gdb -- start gdb running, default procedure
+#
+proc default_gdb_start { } {
+    global verbose
+    global GDB
+    global GDBFLAGS
+    global prompt
+    global spawn_id
+    global timeout
+    verbose "Spawning $GDB $GDBFLAGS"
+    
+    set oldtimeout $timeout
+    set timeout [expr "$timeout + 60"]
+    if [ llength $GDBFLAGS ] then {
+       if {[which $GDB] != 0} then {
+           spawn $GDB $GDBFLAGS
+       } else {
+           perror "$GDB does not exist."
+           exit 1
+       }
+    } else {
+       if {[which $GDB] != 0} then {
+           spawn $GDB
+       } else {
+           perror "$GDB does not exist."
+           exit 1
+       }
+    }
+    expect {
+       -re ".*\r\n$prompt $" {
+           verbose "GDB initialized for native mode"
+       }
+       -re "$prompt $" {
+           perror "GDB never initialized."
+           return -1
+       }
+       timeout         {
+           perror "(timeout) GDB never initialized."
+           return -1
+       }
+    }
+    set timeout $oldtimeout
+    # force the height to "unlimited", so no pagers get used
+    send "set height 0\n"
+    expect {
+       -re ".*$prompt $" { 
+           verbose "Setting height to 0." 2
+       }
+       timeout {
+           warning "Couldn't set the height to 0."
+       }
+    }
+    # force the width to "unlimited", so no wraparound occurs
+    send "set width 0\n"
+    expect {
+       -re ".*$prompt $" {
+           verbose "Seting width to 0." 2
+       }
+       timeout {
+           warning "Couldn't set the width to 0."
+       }
+    }
+}
+
 #
 # FIXME: this is a copy of the new library procedure, but it's here too
 # till the new dejagnu gets installed everywhere. I'd hate to break the