From 2f83a18e2abe9144bfbb72bc75a68ba64445a9e1 Mon Sep 17 00:00:00 2001
From: Daniel Jacobowitz <drow@false.org>
Date: Wed, 18 Oct 2006 16:49:05 +0000
Subject: [PATCH] 	* lib/gdbserver-support.exp (gdb_target_cmd): Anchor
 the ends 	of patterns.

---
 gdb/testsuite/ChangeLog                 |  5 +++++
 gdb/testsuite/lib/gdbserver-support.exp | 17 +++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7396d50fd0..2ca64d7109 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-18  Daniel Jacobowitz  <dan@codesoucery.com>
+
+	* lib/gdbserver-support.exp (gdb_target_cmd): Anchor the ends
+	of patterns.
+
 2006-10-17  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.base/sepdebug.exp: Remove debug format test.
diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index 71535d0085..36a7148c18 100644
--- a/gdb/testsuite/lib/gdbserver-support.exp
+++ b/gdb/testsuite/lib/gdbserver-support.exp
@@ -1,4 +1,5 @@
-# Copyright 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright 2000, 2002, 2003, 2004, 2005, 2006
+# 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
@@ -51,32 +52,32 @@ proc gdb_target_cmd { targetname serialport } {
 		send_gdb "y\n"
 		exp_continue
 	    }
-	    -re "Couldn't establish connection to remote.*$gdb_prompt" {
+	    -re "Couldn't establish connection to remote.*$gdb_prompt $" {
 		verbose "Connection failed"
 	    }
 	    -re "Remote MIPS debugging.*$gdb_prompt" {
 		verbose "Set target to $targetname"
 		return 0
 	    }
-	    -re "Remote debugging using .*$serialport.*$gdb_prompt" {
+	    -re "Remote debugging using .*$serialport.*$gdb_prompt $" {
 		verbose "Set target to $targetname"
 		return 0
 	    }
-	    -re "Remote target $targetname connected to.*$gdb_prompt" {
+	    -re "Remote target $targetname connected to.*$gdb_prompt $" {
 		verbose "Set target to $targetname"
 		return 0
 	    }
-	    -re "Connected to.*$gdb_prompt" { 
+	    -re "Connected to.*$gdb_prompt $" { 
 		verbose "Set target to $targetname"
 		return 0
 	    }
-	    -re "Ending remote.*$gdb_prompt" { }
-	    -re "Connection refused.*$gdb_prompt" {
+	    -re "Ending remote.*$gdb_prompt $" { }
+	    -re "Connection refused.*$gdb_prompt $" {
 		verbose "Connection refused by remote target.  Pausing, and trying again."
 		sleep 30
 		continue
 	    }
-	    -re "Timeout reading from remote system.*$gdb_prompt" {
+	    -re "Timeout reading from remote system.*$gdb_prompt $" {
 		verbose "Got timeout error from gdb."
 	    }
 	    timeout {