From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 6A7143858D28; Wed, 20 Mar 2024 18:31:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6A7143858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1710959506; bh=XwlcHmyBZ9cIY0Xle8EoceIbL++Boe0OIf3jEXGRILU=; h=From:To:Subject:Date:From; b=fWXQ6sgxDEqJIByP07uFA+Ij4oz6w3Vf9x0+x7uKJnUiSjLn11lbdH3JQsaWiC866 +zZvDNqOzKvABzENQCaz7MZZO0XILULG8BD9B2jwWKOfsiG1HWqu/7+vZOaLk7hlmQ jnJ+KRrOVNtkexEQR02tGm5HashLd7SRj5uDLvY4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix gdb.server/server-connect.exp for missing ipv6 X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 8d0e6e08317fc622842bfb30480036a991f12e20 X-Git-Newrev: 886d73049c55fa10447240e4b81c413beba31458 Message-Id: <20240320183146.6A7143858D28@sourceware.org> Date: Wed, 20 Mar 2024 18:31:46 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D886d73049c55= fa10447240e4b81c413beba31458 commit 886d73049c55fa10447240e4b81c413beba31458 Author: Tom de Vries Date: Wed Mar 20 19:31:24 2024 +0100 [gdb/testsuite] Fix gdb.server/server-connect.exp for missing ipv6 =20 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 u= sing tcp6:::1 ... =20 Fix this by: - recognizing the error message in gdbserver_start, and returning an em= pty list to signal unsupported, and - handling the unsupported response in the test-case. =20 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 g= dbserver UNSUPPORTED: gdb.server/server-connect.exp: udp6: start gdbserver UNSUPPORTED: gdb.server/server-connect.exp: udp6-with-brackets: start g= dbserver ... =20 Tested on aarch64-linux. =20 Approved-By: Tom Tromey =20 PR testsuite/31502 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D31502 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/gd= b.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] =3D=3D 0 } { + unsupported $test + continue } else { pass "$test" } diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gd= bserver-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." }