public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] [gdb/testsuite] Fix gdb.server/server-connect.exp for missing ipv6
@ 2024-03-20 18:31 Tom de Vries
  0 siblings, 0 replies; only message in thread
From: Tom de Vries @ 2024-03-20 18:31 UTC (permalink / raw)
  To: gdb-cvs

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=886d73049c55fa10447240e4b81c413beba31458

commit 886d73049c55fa10447240e4b81c413beba31458
Author: Tom de Vries <tdevries@suse.de>
Date:   Wed Mar 20 19:31:24 2024 +0100

    [gdb/testsuite] Fix gdb.server/server-connect.exp for missing ipv6
    
    On a system without ipv6 support enabled, when running test-case
    gdb.server/server-connect.exp, it takes about 4 minutes, and I get:
    ...
    builtin_spawn gdbserver --once ::1:2347 server-connect^M
    Can't open socket: Address family not supported by protocol.^M
    Exiting^M
    PASS: gdb.server/server-connect.exp: tcp6: start gdbserver
    target remote tcp6:::1:2347^M
    A program is being debugged already.  Kill it? (y or n) y^M
    could not connect: Address family not supported by protocol.^M
    (gdb) FAIL: gdb.server/server-connect.exp: tcp6: connect to gdbserver using tcp6:::1
    ...
    
    Fix this by:
    - recognizing the error message in gdbserver_start, and returning an empty list
      to signal unsupported, and
    - handling the unsupported response in the test-case.
    
    This brings testing time down to 2 seconds, and gets me:
    ...
    UNSUPPORTED: gdb.server/server-connect.exp: tcp6: start gdbserver
    UNSUPPORTED: gdb.server/server-connect.exp: tcp6-with-brackets: start gdbserver
    UNSUPPORTED: gdb.server/server-connect.exp: udp6: start gdbserver
    UNSUPPORTED: gdb.server/server-connect.exp: udp6-with-brackets: start gdbserver
    ...
    
    Tested on aarch64-linux.
    
    Approved-By: Tom Tromey <tom@tromey.com>
    
    PR testsuite/31502
    Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31502

Diff:
---
 gdb/testsuite/gdb.server/server-connect.exp | 3 +++
 gdb/testsuite/lib/gdbserver-support.exp     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/gdb/testsuite/gdb.server/server-connect.exp b/gdb/testsuite/gdb.server/server-connect.exp
index dd81585a796..7617da66acd 100644
--- a/gdb/testsuite/gdb.server/server-connect.exp
+++ b/gdb/testsuite/gdb.server/server-connect.exp
@@ -88,6 +88,9 @@ save_vars { GDB_TEST_SOCKETHOST } {
 	    } else {
 		if { $gdbserver_should_fail } {
 		    fail "$test: gdbserver should fail but did not"
+		} elseif { [llength $res] == 0 } {
+		    unsupported $test
+		    continue
 		} else {
 		    pass "$test"
 		}
diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
index e8ab057647d..727a66e2ab1 100644
--- a/gdb/testsuite/lib/gdbserver-support.exp
+++ b/gdb/testsuite/lib/gdbserver-support.exp
@@ -382,6 +382,9 @@ proc gdbserver_start { options arguments } {
 	    -re ".*: cannot resolve name: .*\r\n" {
 		error "gdbserver cannot resolve name."
 	    }
+	    -re "Can't open socket: Address family not supported by protocol." {
+		return {}
+	    }
 	    timeout {
 		error "Timeout waiting for gdbserver response."
 	    }

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2024-03-20 18:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-20 18:31 [binutils-gdb] [gdb/testsuite] Fix gdb.server/server-connect.exp for missing ipv6 Tom de Vries

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).