Match any kind of error after "cannot resolve name" on lib/gdbserver-support.exp...

[deliverable/binutils-gdb.git] / gdb / testsuite / lib / gdbserver-support.exp

diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index 67a83336f924f3d388b2b8219fcdf988636f93c3..a741876a3a7423ed2c86202769704d9107db9ffe 100644 (file)
--- a/gdb/testsuite/lib/gdbserver-support.exp
+++ b/gdb/testsuite/lib/gdbserver-support.exp
@@ -1,4 +1,4 @@
-# Copyright 2000-2016 Free Software Foundation, Inc.
+# Copyright 2000-2018 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
@@ -141,6 +141,20 @@ proc skip_gdbserver_tests { } {
     return 1
   }
 
+    # If GDB is lack of XML support, and targets, like arm, have
+    # multiple target descriptions, GDB doesn't know which target
+    # description GDBserver uses, and may fail to parse 'g' packet
+    # after connection.
+    if { [gdb_skip_xml_test]
+        && ([istarget "arm*-*-linux*"]
+            || [istarget "mips*-*-linux*"]
+            || [istarget "powerpc*-*-linux*"]
+            || [istarget "s390*-*-linux*"]
+            || [istarget "x86_64-*-linux*"]
+            || [istarget "i\[34567\]86-*-linux*"]) } {
+       return 1
+    }
+
   return 0
 }
 
@@ -155,6 +169,10 @@ proc gdbserver_download_current_prog { } {
     global gdbserver_server_exec
     global last_loaded_file
 
+    if { ![info exists last_loaded_file] } {
+       return ""
+    }
+
     set host_exec $last_loaded_file
 
     # If we already downloaded a file to the target, see if we can reuse it.
@@ -193,7 +211,7 @@ proc gdbserver_default_get_remote_address { host port } {
 # Default routine to compute the "comm" argument for gdbserver.
 
 proc gdbserver_default_get_comm_port { port } {
-    return ":$port"
+    return "$port"
 }
 
 # Start a gdbserver process with initial OPTIONS and trailing ARGUMENTS.
@@ -203,6 +221,7 @@ proc gdbserver_default_get_comm_port { port } {
 
 proc gdbserver_start { options arguments } {
     global portnum
+    global GDB_TEST_SOCKETHOST
 
     # Port id -- either specified in baseboard file, or managed here.
     if [target_info exists gdb,socketport] {
@@ -213,10 +232,22 @@ proc gdbserver_start { options arguments } {
     }
 
     # Extract the local and remote host ids from the target board struct.
-    if [target_info exists sockethost] {
+    if { [info exists GDB_TEST_SOCKETHOST] } {
+       # The user is not supposed to provide a port number, just a
+       # hostname/address, therefore we add the trailing ":" here.
+       set debughost "${GDB_TEST_SOCKETHOST}:"
+       # Escape open and close square brackets.
+       set debughost_tmp [string map { [ \\[ ] \\] } $debughost]
+       # We need a "gdbserver" version of the debughost, which will
+       # have the possible connection prefix stripped.  This is
+       # because gdbserver currently doesn't recognize the prefixes.
+       regsub -all "^\(tcp:|udp:|tcp4:|udp4:|tcp6:|udp6:\)" $debughost_tmp "" debughost_gdbserver
+    } elseif [target_info exists sockethost] {
        set debughost [target_info sockethost]
+       set debughost_gdbserver $debughost
     } else {
        set debughost "localhost:"
+       set debughost_gdbserver $debughost
     }
 
     # Some boards use a different value for the port that is passed to
@@ -259,8 +290,14 @@ proc gdbserver_start { options arguments } {
        if { $options != "" } {
            append gdbserver_command " $options"
        }
+       if { $debughost_gdbserver != "" } {
+           append gdbserver_command " $debughost_gdbserver"
+       }
        if { $portnum != "" } {
-           append gdbserver_command " [$get_comm_port $portnum]"
+           if { $debughost_gdbserver == "" } {
+               append gdbserver_command " "
+           }
+           append gdbserver_command "[$get_comm_port $portnum]"
        }
        if { $arguments != "" } {
            append gdbserver_command " $arguments"
@@ -289,6 +326,9 @@ proc gdbserver_start { options arguments } {
                    continue
                }
            }
+           -re ".*: cannot resolve name: .*\r\n" {
+               error "gdbserver cannot resolve name."
+           }
            timeout {
                error "Timeout waiting for gdbserver response."
            }
@@ -320,7 +360,7 @@ proc gdbserver_spawn { child_args } {
 # Close the GDBserver connection.
 
 proc close_gdbserver {} {
-    global server_spawn_id inferior_spawn_id
+    global server_spawn_id
 
     # We can't just call close, because if gdbserver is local then that means
     # that it will get a SIGHUP.  Doing it this way could also allow us to
@@ -336,23 +376,30 @@ proc close_gdbserver {} {
     catch "close -i $server_spawn_id"
     catch "wait -i $server_spawn_id"
     unset server_spawn_id
-    unset inferior_spawn_id
 }
 
-# Hook into GDB exit, and close GDBserver.
+# Hook into GDB exit, and close GDBserver.  We must load this
+# explicitly here, and rename the procedures we want to override.
+load_lib mi-support.exp
 
-if { [info procs gdbserver_gdb_exit] == "" } {
+if { [info procs gdbserver_orig_gdb_exit] == "" } {
     rename gdb_exit gdbserver_orig_gdb_exit
+    rename mi_gdb_exit gdbserver_orig_mi_gdb_exit
 }
-proc gdb_exit {} {
-    global gdb_spawn_id server_spawn_id inferior_spawn_id
+
+proc gdbserver_gdb_exit { is_mi } {
+    global gdb_spawn_id server_spawn_id
     global gdb_prompt
     global gdbserver_reconnect_p
 
     # Leave GDBserver running if we're exiting GDB in order to
     # reconnect to the same instance of GDBserver again.
     if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p} {
-       gdbserver_orig_gdb_exit
+       if { $is_mi } {
+           gdbserver_orig_mi_gdb_exit
+       } else {
+           gdbserver_orig_gdb_exit
+       }
        return
     }
 
@@ -361,7 +408,12 @@ proc gdb_exit {} {
        # but DejaGNU doesn't know that, so gdb_spawn_id isn't unset.
        # Catch the exceptions.
        catch {
-           send_gdb "monitor exit\n";
+           if { $is_mi } {
+               set monitor_exit "-interpreter-exec console \"monitor exit\""
+           } else {
+               set monitor_exit "monitor exit"
+           }
+           send_gdb "$monitor_exit\n";
            # We use expect rather than gdb_expect because
            # we want to suppress printing exception messages, otherwise,
            # remote_expect, invoked by gdb_expect, prints the exceptions.
@@ -372,14 +424,25 @@ proc gdb_exit {} {
                -i "$server_spawn_id" eof {
                    wait -i $expect_out(spawn_id)
                    unset server_spawn_id
-                   unset inferior_spawn_id
                }
            }
        }
     }
     close_gdbserver
 
-    gdbserver_orig_gdb_exit
+    if { $is_mi } {
+       gdbserver_orig_mi_gdb_exit
+    } else {
+       gdbserver_orig_gdb_exit
+    }
+}
+
+proc gdb_exit {} {
+    gdbserver_gdb_exit 0
+}
+
+proc mi_gdb_exit {} {
+    gdbserver_gdb_exit 1
 }
 
 # Start a gdbserver process running HOST_EXEC and pass CHILD_ARGS