From e2d69cb50563ef308bbb268779489b9afcdf9e9b Mon Sep 17 00:00:00 2001
From: Jie Zhang <jie.zhang@analog.com>
Date: Mon, 15 Mar 2010 03:43:13 +0000
Subject: [PATCH] 	* lib/mi-support.exp (mi_gdb_target_load): Delete
 unused timeout var. 	Declare and use new loadtimeout variable.

---
 gdb/testsuite/ChangeLog          |  5 +++++
 gdb/testsuite/lib/mi-support.exp | 27 ++++++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9f2122af864..84c5eef9a28 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-15  Jie Zhang  <jie@codesourcery.com>
+
+	* lib/mi-support.exp (mi_gdb_target_load): Delete unused timeout var.
+	Declare and use new loadtimeout variable.
+
 2010-03-14  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.base/printcmds.exp: Use gdb_file_cmd instead of gdb_load.
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index ec60ef91eba..e1dbd19bf56 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -462,7 +462,12 @@ proc mi_gdb_target_load { } {
     global loadfile
     global GDB
     global mi_gdb_prompt
-    upvar timeout timeout
+
+    if [target_info exists gdb_load_timeout] {
+	set loadtimeout [target_info gdb_load_timeout]
+    } else {
+	set loadtimeout 1600
+    }
 
     if { [info procs gdbserver_gdb_load] != "" } {
 	mi_gdb_test "kill" ".*" ""
@@ -480,40 +485,40 @@ proc mi_gdb_target_load { } {
 	    -re ".*$mi_gdb_prompt$"
 	}
 	send_target_sid
-	gdb_expect 60 {
+	gdb_expect $loadtimeout {
 	    -re "\\^done.*$mi_gdb_prompt$" {
 	    }
 	    timeout {
-		perror "Unable to connect to SID target"
+		perror "Unable to connect to SID target (timeout)"
 		return -1
 	    }
 	}
 	send_gdb "48-target-download\n"
-	gdb_expect 10 {
+	gdb_expect $loadtimeout {
 	    -re "48\\^done.*$mi_gdb_prompt$" {
 	    }
 	    timeout {
-		perror "Unable to download to SID target"
+		perror "Unable to download to SID target (timeout)"
 		return -1
 	    }
 	}
     } elseif { [target_info protocol] == "sim" } {
 	# For the simulator, just connect to it directly.
 	send_gdb "47-target-select sim\n"
-	gdb_expect 10 {
+	gdb_expect $loadtimeout {
 	    -re "47\\^connected.*$mi_gdb_prompt$" {
 	    }
 	    timeout {
-		perror "Unable to select sim target"
+		perror "Unable to select sim target (timeout)"
 		return -1
 	    }
 	}
 	send_gdb "48-target-download\n"
-	gdb_expect 10 {
+	gdb_expect $loadtimeout {
 	    -re "48\\^done.*$mi_gdb_prompt$" {
 	    }
 	    timeout {
-		perror "Unable to download to sim target"
+		perror "Unable to download to sim target (timeout)"
 		return -1
 	    }
 	}
@@ -524,11 +529,11 @@ proc mi_gdb_target_load { } {
 	    return -1
 	}
 	send_gdb "48-target-download\n"
-	gdb_expect 10 {
+	gdb_expect $loadtimeout {
 	    -re "48\\^done.*$mi_gdb_prompt$" {
 	    }
 	    timeout {
-		perror "Unable to download to remote target"
+		perror "Unable to download to remote target (timeout)"
 		return -1
 	    }
 	}
-- 
2.30.2