* Revert the previous changes. Please see Rob's directory

	  /lisa/test/rob/progressive/gdb/testsuite for these fixes.

7 files changed, 346 insertions, 7 deletions

diff --git a/gdb/testsuite/config/mips-gdb.exp b/gdb/testsuite/config/mips-gdb.exp
index c9c711e..3fce30e 100644
--- a/gdb/testsuite/config/mips-gdb.exp
+++ b/gdb/testsuite/config/mips-gdb.exp
@@ -69,7 +69,7 @@ proc gdb_load { arg } {
     expect {
 	-re "A program is being debugged already.  Kill it\? \(y or n\)" {
 	    send "y\n"
-	    continue -expect
+	    exp_continue
 	}
 	-re "Reading symbols from.*done..*$prompt $" { }
 	-re "$prompt $" { perror "GDB couldn't read file" }
diff --git a/gdb/testsuite/config/mt-a29k-udi b/gdb/testsuite/config/mt-a29k-udi
index d81f592..b3b4e4d 100644
--- a/gdb/testsuite/config/mt-a29k-udi
+++ b/gdb/testsuite/config/mt-a29k-udi
@@ -1 +1,59 @@
-CFLAGS_FOR_TARGET =
+# compilers and assemblers
+CC = a29k-amd-udi-gcc
+CFLAGS = -g -D${target_os}
+C++ = ${CC}
+C++FLAGS = ${CFLAGS}
+CXX = ${CC}
+CXXFLAGS = ${CFLAGS}
+AS = a29k-amd-udi-as
+ASFLAGS = 
+FC =
+FCFLAGS = 
+LD = ld
+LDFLAGS = 
+LIBS =
+
+# binutils
+
+RANLIB = a29k-amd-udi-ranlib
+RANLIBFLAGS =
+
+NM = a29k-amd-udi-nm
+NMFLAGS =
+
+SIZE = a29k-amd-udi-size
+SIZEFLAGS =
+
+STRIP = a29k-amd-udi-strip
+STRIPFLAGS =
+
+OBJDUMP = a29k-amd-udi-objdump
+OBJDUMPFLAGS =
+
+DEMANGLE = a29k-amd-udi-demangle
+DEMANGLEFLAGS =
+
+COPY = a29k-amd-udi-copy
+COPYFLAGS =
+
+# other utils
+LEX = flex
+LEXFLAGS =
+
+YACC = byacc
+YACCFLAGS = 
+
+AR = a29k-amd-udi-ar
+ARFLAGS =
+
+CPP = ${CC} -E
+CPPFLAGS = 
+
+GDB = a29k-amd-udi-gdb
+GDBFLAGS = -nx
+
+DIFF = diff
+DIFFFLAGS = 
+
+RUNTEST=a29k-amd-udi-runtest
+RUNTESTFLAGS=
diff --git a/gdb/testsuite/config/mt-i386-aout b/gdb/testsuite/config/mt-i386-aout
index 48ef7f7..19b1cab 100644
--- a/gdb/testsuite/config/mt-i386-aout
+++ b/gdb/testsuite/config/mt-i386-aout
@@ -1 +1,59 @@
-CFLAGS_FOR_TARGET = 
\ No newline at end of file
+# compilers and assemblers
+CC = i386-aout-gcc
+CFLAGS = -g -D${target_os}
+C++ = ${CC}
+C++FLAGS = ${CFLAGS}
+CXX = ${CC}
+CXXFLAGS = ${CFLAGS}
+AS = i386-aout-as
+ASFLAGS = 
+FC =
+FCFLAGS = 
+LD = ld
+LDFLAGS = 
+LIBS = 
+
+# binutils
+
+RANLIB = i386-aout-ranlib
+RANLIBFLAGS =
+
+NM = i386-aout-nm
+NMFLAGS =
+
+SIZE = i386-aout-size
+SIZEFLAGS =
+
+STRIP = i386-aout-strip
+STRIPFLAGS =
+
+OBJDUMP = i386-aout-objdump
+OBJDUMPFLAGS =
+
+DEMANGLE = i386-aout-demangle
+DEMANGLEFLAGS =
+
+COPY = i386-aout-copy
+COPYFLAGS =
+
+# other utils
+LEX = flex
+LEXFLAGS =
+
+YACC = byacc
+YACCFLAGS = 
+
+AR = i386-aout-ar
+ARFLAGS =
+
+CPP = ${CC} -E
+CPPFLAGS = 
+
+GDB = i386-aout-gdb
+GDBFLAGS = -nx
+
+DIFF = diff
+DIFFFLAGS = 
+
+RUNTEST=i386-aout-runtest
+RUNTESTFLAGS=
diff --git a/gdb/testsuite/config/mt-i960-nindy b/gdb/testsuite/config/mt-i960-nindy
index a6ae4b6..bf5e486 100644
--- a/gdb/testsuite/config/mt-i960-nindy
+++ b/gdb/testsuite/config/mt-i960-nindy
@@ -1 +1,59 @@
-CFLAGS_FOR_TARGET = -nostartfiles
+# compilers and assemblers
+CC = i960-intel-nindy-gcc
+CFLAGS = -g -D${target_os}
+C++ = ${CC}
+C++FLAGS = ${CFLAGS}
+CXX = ${CC}
+CXXFLAGS = ${CFLAGS}
+AS = i960-intel-nindy-as
+ASFLAGS = 
+FC =
+FCFLAGS = 
+LD = ld
+LDFLAGS = 
+LIBS = 
+
+# binutils
+
+RANLIB = i960-intel-nindy-ranlib
+RANLIBFLAGS =
+
+NM = i960-intel-nindy-nm
+NMFLAGS =
+
+SIZE = i960-intel-nindy-size
+SIZEFLAGS =
+
+STRIP = i960-intel-nindy-strip
+STRIPFLAGS =
+
+OBJDUMP = i960-intel-nindy-objdump
+OBJDUMPFLAGS =
+
+DEMANGLE = i960-intel-nindy-demangle
+DEMANGLEFLAGS =
+
+COPY = i960-intel-nindy-copy
+COPYFLAGS =
+
+# other utils
+LEX = flex
+LEXFLAGS =
+
+YACC = byacc
+YACCFLAGS = 
+
+AR = i960-intel-nindy-ar
+ARFLAGS =
+
+CPP = ${CC} -E
+CPPFLAGS = 
+
+GDB = i960-intel-nindy-gdb
+GDBFLAGS = -nx
+
+DIFF = diff
+DIFFFLAGS = 
+
+RUNTEST=i960-intel-nindy-runtest
+RUNTESTFLAGS=
diff --git a/gdb/testsuite/config/mt-sparc-aout b/gdb/testsuite/config/mt-sparc-aout
index f88f208..c3abe65 100644
--- a/gdb/testsuite/config/mt-sparc-aout
+++ b/gdb/testsuite/config/mt-sparc-aout
@@ -1 +1,59 @@
-CFLAGS_FOR_TARGET = 
+# compilers and assemblers
+CC = sparc-aout-gcc
+CFLAGS = -g -D${target_os}
+C++ = ${CC}
+C++FLAGS = ${CFLAGS}
+CXX = ${CC}
+CXXFLAGS = ${CFLAGS}
+AS = sparc-aout-as
+ASFLAGS = 
+FC =
+FCFLAGS = 
+LD = ld
+LDFLAGS = 
+LIBS = 
+
+# binutils
+
+RANLIB = sparc-aout-ranlib
+RANLIBFLAGS =
+
+NM = sparc-aout-nm
+NMFLAGS =
+
+SIZE = sparc-aout-size
+SIZEFLAGS =
+
+STRIP = sparc-aout-strip
+STRIPFLAGS =
+
+OBJDUMP = sparc-aout-objdump
+OBJDUMPFLAGS =
+
+DEMANGLE = sparc-aout-demangle
+DEMANGLEFLAGS =
+
+COPY = sparc-aout-copy
+COPYFLAGS =
+
+# other utils
+LEX = flex
+LEXFLAGS =
+
+YACC = byacc
+YACCFLAGS = 
+
+AR = sparc-aout-ar
+ARFLAGS =
+
+CPP = ${CC} -E
+CPPFLAGS = 
+
+GDB = sparc-aout-gdb
+GDBFLAGS = -nx
+
+DIFF = diff
+DIFFFLAGS = 
+
+RUNTESTFLAGS=sparc-aout-runtest
+RUNTESTFLAGS=
diff --git a/gdb/testsuite/config/udi-gdb.exp b/gdb/testsuite/config/udi-gdb.exp
index 8bad181..5d44efc 100644
--- a/gdb/testsuite/config/udi-gdb.exp
+++ b/gdb/testsuite/config/udi-gdb.exp
@@ -24,6 +24,13 @@
 # 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
 
@@ -89,9 +96,47 @@ proc gdb_load { arg } {
     gdb_target_udi
 }
 
+#
+# gdb_start -- start GDB running. This assumes that there the
+#              UDICONF enviroment variable is set.
+#
 proc gdb_start { } {
-    default_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 $" {}
+
     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 aec80a3..1edda20 100644
--- a/gdb/testsuite/config/unix-gdb.exp
+++ b/gdb/testsuite/config/unix-gdb.exp
@@ -60,8 +60,70 @@ proc gdb_load { arg } {
     return [gdb_file_cmd $arg]
 }
 
+#
+# start gdb -- start gdb running
+#
+
 proc gdb_start {} {
-    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."
+	}
+    }
 }
 
 proc gdb_exit { } {