X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Fruntest-ugdb%2Fnative-ugdb-config.exp;h=2cd328c7b7565fe7a15d0025d325da4748d9e7f7;hb=ea9e4c327bfd50d4c64b590b1444ac6959156bc8;hp=ae8cf29cacd89b4a4cf8bb77ced8ae6afc615ee2;hpb=5d80aa26cb9b39b06b941acb56d5f76594f47099;p=nethome.git

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]
+}