From 0e865b395050d2d644ab7b51b18d5254ad3c33dd Mon Sep 17 00:00:00 2001
From: Bob Manson <manson@cygnus>
Date: Fri, 31 Jan 1997 04:38:01 +0000
Subject: [PATCH] Miscellaneous fixes for config/slite.exp.
---
gdb/testsuite/ChangeLog | 2 ++
gdb/testsuite/config/slite.exp | 37 ++++++++++++++++++----------------
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e7a76b67043..5b9e68582f2 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,7 @@
Thu Jan 30 16:49:25 1997 Bob Manson <manson@charmed.cygnus.com>
+ * config/slite.exp: Miscellaneous fixes.
+
* lib/gdb.exp: Fix runto.
* gdb.base/signals.exp: Check for a gdb,nosignals feature of
diff --git a/gdb/testsuite/config/slite.exp b/gdb/testsuite/config/slite.exp
index 7109a2ed94e..771a9e1dbb7 100644
--- a/gdb/testsuite/config/slite.exp
+++ b/gdb/testsuite/config/slite.exp
@@ -141,23 +141,26 @@ proc gdb_load { arg } {
}
if [target_info exists gdb_serial] {
- send_gdb "target remote [target_info gdb_serial]\n"
- set timeout 60
- verbose "Timeout is now $timeout seconds" 2
- expect {
- -i $gdb_spawn_id -re ".*Kill it?.*y or n.*" {
- send_gdb "y\n";
- exp_continue
- }
- -i $gdb_spawn_id -re ".*$prompt $" {
- verbose "Set remote target to [target_info serial]" 2
- }
- -i $gdb_spawn_id timeout {
- perror "Couldn't set remote target."
- set timeout 10
- verbose "Timeout is now $timeout seconds" 2
- return -1
- }
+ set serial [target_info gdb_serial];
+ } else {
+ set serial [target_info serial];
+ }
+ send_gdb "target remote $serial\n"
+ set timeout 60
+ verbose "Timeout is now $timeout seconds" 2
+ expect {
+ -i $gdb_spawn_id -re ".*Kill it?.*y or n.*" {
+ send_gdb "y\n";
+ exp_continue
+ }
+ -i $gdb_spawn_id -re ".*$prompt $" {
+ verbose "Set remote target to [target_info serial]" 2
+ }
+ -i $gdb_spawn_id timeout {
+ perror "Couldn't set remote target."
+ set timeout 10
+ verbose "Timeout is now $timeout seconds" 2
+ return -1
}
}