From eaac098bd37b4e90673ebc590ecde51a41ee03c9 Mon Sep 17 00:00:00 2001
From: Bob Manson <manson@cygnus>
Date: Wed, 3 Sep 1997 02:56:30 +0000
Subject: [PATCH] 	* config/sparclet.exp: Detect gratuitous change to
 sparclet gdb  	target mode.

---
 gdb/testsuite/ChangeLog           | 13 +++++++++
 gdb/testsuite/config/sparclet.exp | 44 ++++++++++++++++++-------------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6c7836dedee..c62d87e3f8b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+Tue Sep  2 19:55:34 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* config/sparclet.exp: Detect gratuitous change to sparclet gdb
+ 	target mode.
+
+Mon Jul 28 12:14:47 1997  Stan Shebs  <shebs@andros.cygnus.com>
+
+	From Bob Manson:
+	* config/monitor.exp (gdb_target_monitor): Look for "Connected to"
+ 	string from GDB when it connects.
+
+	* lib/gdb.exp: Look for $TOOL_EXECUTABLE.
+
 Thu Jul  3 15:35:12 1997  Bob Manson  <manson@charmed.cygnus.com>
 
 	* lib/gdb.exp(get_debug_format): Don't cause the testsuite to fail
diff --git a/gdb/testsuite/config/sparclet.exp b/gdb/testsuite/config/sparclet.exp
index db128b0c241..1919aca4f86 100644
--- a/gdb/testsuite/config/sparclet.exp
+++ b/gdb/testsuite/config/sparclet.exp
@@ -181,9 +181,13 @@ proc gdb_sparclet_startup { arg } {
 
 	send_gdb "load $loader [target_info gdb_stub_offset]\n"
 	verbose "Loading $loader into $GDB" 2
+	set no_run_command 0;
 	gdb_expect 1200 {
 	     -re "Loading.*$gdb_prompt $" {
 		verbose "Loaded $loader into $GDB" 1
+	    }
+	    -re "Transfer rate:.*Switching to remote protocol.*Remote debugging" {
+		set no_run_command 1;
 	    }
 	     -re "$gdb_prompt $"     {
 		if $verbose>1 then {
@@ -197,25 +201,27 @@ proc gdb_sparclet_startup { arg } {
 	    }
 	}
 
-	send_gdb "run\n";
-	gdb_expect 60 {
-	     -re "A program is being debug.*Kill it.*y or n. $" {
-		send_gdb "y\n"
-		exp_continue
-	    }
-	     -re "The program being debugged .*y or n. $" {
-		send_gdb "y\n"
-		exp_continue
-	    }
-	     -re "Starting program:.*loader.*$" { 
-		verbose "Starting loader succeeded" 
-	    }
-	    timeout { 
-		perror "(timeout) starting the loader" ; 
-		return -1 
-	    }
-	    default {
-		perror "error starting the loader";
+	if !$no_run_command {
+	    send_gdb "run\n";
+	    gdb_expect 60 {
+		-re "A program is being debug.*Kill it.*y or n. $" {
+		    send_gdb "y\n"
+		    exp_continue
+		}
+		-re "The program being debugged .*y or n. $" {
+		    send_gdb "y\n"
+		    exp_continue
+		}
+		-re "Starting program:.*loader.*$" { 
+		    verbose "Starting loader succeeded" 
+		}
+		timeout { 
+		    perror "(timeout) starting the loader" ; 
+		    return -1 
+		}
+		default {
+		    perror "error starting the loader";
+		}
 	    }
 	}
 	sleep 2;
-- 
2.30.2