From patchwork Tue Mar 19 07:48:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 87339 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 86FDA3858CD1 for ; Tue, 19 Mar 2024 07:47:28 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 68FD43858D33 for ; Tue, 19 Mar 2024 07:47:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 68FD43858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 68FD43858D33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710834428; cv=none; b=aES+3HkAjxalvUNVML6zeMruchgephox7CL+CdJtCdgp4afdzVDeSZgB8TERvjhQ/FSSromDlf9pi9yQ8lyXQykGgwjFWigOmE916qu52SIC5cMfpuWJsmwhJYmCLGFpBXydooP2aA9vUroydiIXcag8QVzvIhxo9C7POZczmTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710834428; c=relaxed/simple; bh=dLk0GVmZDZVva/9iZBiV5pOWZkGpHGf4376fzgQXLP8=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=fBRjvtK6DvLnxBU3FlAcb+JgBZLj3TPlKr2ryluQ2fNwLc34Fzc/5On/+sx0E5j3J+kqLecCy/KZx1YtrFTiuOXJsVthdhLJzVn6WKp5Cnr/mvvOdW6TgQfgZQjlJmKHSjltKJI9bkUQYbu4L3bYqD+bPOFY9Oarlh35WxrMTJg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 17B535D2DB for ; Tue, 19 Mar 2024 07:47:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710834425; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=N3hc+PYQa3iIDRJn5GHLhiML0WuIzup3Gpb1w7Q+eEY=; b=ahvIOiVejKCF2+A1qht36b7XHFU6ee0S8eeTNzK+ADUag9fmfHpDEsPbSsUvxQAvqTyFRv +sYXcipyS0Fz6/O185te/W1ZvThvRTSD6AH4Mw5Mme/LNzbfUiYhXSp2HvKqj34RX1Qett Vpm+Ur5ySAwHRc45YFROEnAYnwASSm0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710834425; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=N3hc+PYQa3iIDRJn5GHLhiML0WuIzup3Gpb1w7Q+eEY=; b=K3CkR431TuxiTFeswyIkcC/iKBqvxqRxuYisEAB0K7xXfzM3R00dpHRFTnxPr6aIBx8eJ2 1VIf4OBZjMmdxcCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710834424; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=N3hc+PYQa3iIDRJn5GHLhiML0WuIzup3Gpb1w7Q+eEY=; b=iM34S3bVJKmle0s1a2rO7ezL85bcyDlWU6aQTWbvuZvUc76MIU6E2WtvAOWkSw12Df9evp td4GJDjZV7iA1ZCHC9fUOy2EtQeMH7/gaN4D0gmvxuwtjaXmbKOvz9koyPzA5VS6Ron/Ne FSnF95XocNJu7bgxUuipVZ02os2iID8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710834424; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=N3hc+PYQa3iIDRJn5GHLhiML0WuIzup3Gpb1w7Q+eEY=; b=aj0ffXgrmdhbo5mGIlgoSttZ0hE9UMpGreygq4SRBGlghdg1JKnKgSdNOpguhSwT53piBp Ez8GeCT4xhRdFyBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id EB6F4136A5 for ; Tue, 19 Mar 2024 07:47:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id rGn1N/dC+WUibwAAD6G6ig (envelope-from ) for ; Tue, 19 Mar 2024 07:47:03 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Fix gdb.server/server-connect.exp for missing ipv6 Date: Tue, 19 Mar 2024 08:48:10 +0100 Message-Id: <20240319074810.18541-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spam-Level: X-Spam-Score: 0.70 X-Spamd-Result: default: False [0.70 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_DN_NONE(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.20)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.996]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[sourceware.org:url]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[] X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org 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. PR testsuite/31502 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31502 --- gdb/testsuite/gdb.server/server-connect.exp | 3 +++ gdb/testsuite/lib/gdbserver-support.exp | 3 +++ 2 files changed, 6 insertions(+) base-commit: 29807db8d7b244e3a1a7503237c7b391b3393007 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." }