From 19014b8c9337c0c66e00364fb1b60dec6268a5fc Mon Sep 17 00:00:00 2001
From: jkratoch <>
Date: Sun, 5 Sep 2010 19:01:06 +0000
Subject: [PATCH] Fix extended-remote mode.

---
 src/runtest-ugdb/boards/native-ugdb.exp |  3 +++
 src/runtest-ugdb/native-ugdb-config.exp | 24 ++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/runtest-ugdb/boards/native-ugdb.exp b/src/runtest-ugdb/boards/native-ugdb.exp
index 11afb30..0188209 100644
--- a/src/runtest-ugdb/boards/native-ugdb.exp
+++ b/src/runtest-ugdb/boards/native-ugdb.exp
@@ -45,3 +45,6 @@ set_board_info sockethost "localhost:"
 # That is, the target processes are on the same host.
 # Does not work: set_board_info isremote 0
 set board_info(native-ugdb,isremote) 0
+
+# Some testcases do not expect the messages.
+set ugdb_debug 0
diff --git a/src/runtest-ugdb/native-ugdb-config.exp b/src/runtest-ugdb/native-ugdb-config.exp
index ae8cf29..2cd328c 100644
--- a/src/runtest-ugdb/native-ugdb-config.exp
+++ b/src/runtest-ugdb/native-ugdb-config.exp
@@ -57,9 +57,7 @@ proc gdbserver_start { options arguments } {
 	error "Port $port is still closed"
     }
 
-    # It should be "extended-remote" but gdbserver_start_extended prepends
-    # another "extended-" string.
-    return [list "remote" "localhost:$port"]
+    return [list "extended-remote" "localhost:$port"]
 }
 
 load_lib mi-support.exp
@@ -68,9 +66,9 @@ proc mi_gdb_start { args } {
     set retval [default_mi_gdb_start $args]
 
     if {$retval == 0} {
-	global mi_gdb_prompt
+	global mi_gdb_prompt ugdb_debug
 
-	set test "-gdb-set debug remote 1"
+	set test "-gdb-set debug remote $ugdb_debug"
 	gdb_test_multiple $test $test {
 	    -re "\\\^done\r\n$mi_gdb_prompt$" {
 		pass $test
@@ -87,8 +85,22 @@ proc gdb_start { } {
     set retval [default_gdb_start]
 
     if {$retval == 0} {
-	gdb_test "set debug remote 1"
+	global ugdb_debug
+	gdb_test_no_output "set debug remote $ugdb_debug"
+	gdb_test_no_output "set target-async on"
+	gdb_test_no_output "set non-stop on"
     }
 
     return $retval
 }
+
+load_lib gdbserver-support.exp
+
+# Do not prepend the "extended-" string.
+proc gdbserver_start_extended { } {
+    set res [gdbserver_start "--multi" ""]
+    set gdbserver_protocol [lindex $res 0]
+    set gdbserver_gdbport [lindex $res 1]
+
+    return [gdb_target_cmd $gdbserver_protocol $gdbserver_gdbport]
+}
-- 
1.8.3.1