* config/est.exp: Fix copyright and comments. Remove dead code.

	Use targetname, serialport and baud variables instead of fixed
	constants.
	* config/rom68k.exp:  Fix copyright and comments.  Remove dead code.
	* config/cpu32bug.exp:  New file to support cpu32bug monitors.

5 files changed, 225 insertions, 12 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5be65d4..3457199 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+Wed Apr 19 17:41:21 1995  Stu Grossman  (grossman@cygnus.com)
+
+	* config/est.exp:  Fix copyright and comments.  Remove dead code.
+	Use targetname, serialport and baud variables instead of fixed
+	constants.
+	* config/rom68k.exp:  Fix copyright and comments.  Remove dead code.
+	* config/cpu32bug.exp:  New file to support cpu32bug monitors.
+
 Wed Apr 19 13:47:16 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* gdb.base/watchpoint.exp: Don't run
diff --git a/gdb/testsuite/config/.Sanitize b/gdb/testsuite/config/.Sanitize
index f695dae..976edc4 100644
--- a/gdb/testsuite/config/.Sanitize
+++ b/gdb/testsuite/config/.Sanitize
@@ -23,6 +23,7 @@ Do-first:
 
 Things-to-keep:
 
+cpu32bug.exp
 est.exp
 mips-gdb.exp
 mt-a29k-udi
diff --git a/gdb/testsuite/config/cpu32bug.exp b/gdb/testsuite/config/cpu32bug.exp
new file mode 100644
index 0000000..920ea48
--- /dev/null
+++ b/gdb/testsuite/config/cpu32bug.exp
@@ -0,0 +1,105 @@
+# Test Framework Driver for GDB driving the Motorola Cpu32Bug monitor
+#   Copyright 1995 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+load_lib gdb.exp
+
+#
+# gdb_version -- extract and print the version number of gdb
+#
+proc gdb_version {} {
+    default_gdb_version
+}
+
+#
+# gdb_target_cpu32bug
+# Set gdb to target the monitor
+#
+proc gdb_target_cpu32bug { } {
+    global prompt
+    global exit_status
+    global targetname
+    global serialport
+    global baud
+
+    send "target $targetname $serialport\n"
+    set timeout 60
+    expect {
+	-re "Remote target cpu32bug connected to.*$prompt $"	{
+	    verbose "Set target to cpu32bug"
+	}
+	timeout { 
+	    perror "Couldn't set target for cpu32bug."
+	    cleanup
+	    exit $exit_status
+	}
+    }
+    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_cpu32bug
+
+    send "load\n"
+    set timeout 2400
+    expect {
+	-re ".*$prompt $" {
+	    if $verbose>1 then {
+		send_user "Loaded $arg into $GDB\n"
+	    }
+	    set timeout 30
+	    return 1
+	}
+	-re "$prompt $"     {
+	    if $verbose>1 then {
+	 perror "GDB couldn't load."
+	    }
+	}
+	timeout {
+	    if $verbose>1 then {
+	 perror "Timed out trying to load $arg."
+	    }
+	}
+    }
+}
+
+#
+# gdb_start -- start GDB running.
+#
+proc gdb_start { } {
+    default_gdb_start
+}
+
+#
+# gdb_exit -- exit gdb
+#
+proc gdb_exit { } {
+    catch default_gdb_exit
+}
+
+gdb_start
diff --git a/gdb/testsuite/config/est.exp b/gdb/testsuite/config/est.exp
index e0549b2..4164daf 100644
--- a/gdb/testsuite/config/est.exp
+++ b/gdb/testsuite/config/est.exp
@@ -1,5 +1,5 @@
 # Test Framework Driver for GDB driving the EST
-#   Copyright 1994 Free Software Foundation, Inc.
+#   Copyright 1995 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
@@ -26,13 +26,16 @@ proc gdb_version {} {
 
 #
 # gdb_target_est
-# Set gdb to target the simulator
+# Set gdb to target the monitor
 #
 proc gdb_target_est { } {
     global prompt
     global exit_status
+    global targetname
+    global serialport
+    global baud
 
-    send "target est /dev/ttyb\n"
+    send "target $targetname $serialport\n"
     set timeout 60
     expect {
 	-re "Remote target est connected to.*$prompt $"	{
@@ -90,8 +93,6 @@ proc gdb_load { arg } {
 #
 proc gdb_start { } {
     default_gdb_start
-#    verbose "Setting up target, Please wait..."
-#    gdb_target_est
 }
 
 #
@@ -102,10 +103,3 @@ proc gdb_exit { } {
 }
 
 gdb_start
-
-# make sure gdb has actually started, otherwise if the first test
-# timesout, DejaGnu crashes
-#send "\n"
-#expect {
-#    -re "$prompt"
-#    }
diff --git a/gdb/testsuite/config/rom68k.exp b/gdb/testsuite/config/rom68k.exp
new file mode 100644
index 0000000..83e0c7e
--- /dev/null
+++ b/gdb/testsuite/config/rom68k.exp
@@ -0,0 +1,105 @@
+# Test Framework Driver for GDB driving a Motorola IDP 68k development board
+#   Copyright 1994, 1995 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+load_lib gdb.exp
+
+#
+# gdb_version -- extract and print the version number of gdb
+#
+proc gdb_version {} {
+    default_gdb_version
+}
+
+#
+# gdb_target_rom68k
+# Set gdb to target the monitor
+#
+proc gdb_target_rom68k { } {
+    global prompt
+    global exit_status
+    global targetname
+    global serialport
+    global baud
+
+    send "target $targetname $serialport\n"
+    set timeout 60
+    expect {
+	-re "Remote target rom68k connected to.*$prompt $"	{
+	    verbose "Set target to rom68k"
+	}
+	timeout { 
+	    perror "Couldn't set target for rom68k."
+	    cleanup
+	    exit $exit_status
+	}
+    }
+    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_rom68k
+
+    send "load\n"
+    set timeout 2400
+    expect {
+	-re ".*$prompt $" {
+	    if $verbose>1 then {
+		send_user "Loaded $arg into $GDB\n"
+	    }
+	    set timeout 30
+	    return 1
+	}
+	-re "$prompt $"     {
+	    if $verbose>1 then {
+	 perror "GDB couldn't load."
+	    }
+	}
+	timeout {
+	    if $verbose>1 then {
+	 perror "Timed out trying to load $arg."
+	    }
+	}
+    }
+}
+
+#
+# gdb_start -- start GDB running.
+#
+proc gdb_start { } {
+    default_gdb_start
+}
+
+#
+# gdb_exit -- exit gdb
+#
+proc gdb_exit { } {
+    catch default_gdb_exit
+}
+
+gdb_start