From nobody Tue Apr 08 17:34:54 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZXCrb4CFDz5shQZ; Tue, 08 Apr 2025 17:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZXCrZ6pccz3Jmy; Tue, 08 Apr 2025 17:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744133695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yNkan3FG++TRupKgYramsQ3ohp5laSoB9FnuI+PimRk=; b=ISF6sSoyWICTlnzpUb9Y1rd0plPCqTkJ9uUs60fen2h+KM1i+MrQJ247RsNSI5jU9hmUfc QkWBVVKrvi/J1L9KJjwpuvbsRyTT8BnriSCnMyGL2RpoHi3HviHOLCOzqf6iilqOSC8l7o xm28HIZU++mlZTshXM8OnHyTzPPmgi1wqDDc/ZhnqZmKQwYQPhLA6NcseMUelIpN2yS97q gGJFTC9ckV3QMZ3RkK12P3wzEAMsmf1H6XgxY+WBY3zfbQmXNDKqnKsqIU59SbkxUvEifn rUQabC4EY5iqglZx9a9mP/hiV0oNrVx4hkUl+AQlmZCHj/FBnbPekoXiPVFyyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744133695; a=rsa-sha256; cv=none; b=G41hP3zF7xm1/A1TgqqLmIxqVox3yllhGYblmm9CFu9KRkKGVvUW99V+46QyAh2ImktxlI jSvQ2bc36+99wetYqBH635aKeuY5Qyv/HmpWoSCsTCjshSnAayjCDQFWz+LZi/Vg9W/Ptl 45v5Zj8Ny+ZjO+PELILlXLucyX+Z7oer+SJGeX1oAiWVTH2f+f6xpkYE+RtiQn1J3Yb7MK R35dkwUwCNpqkE0w/dRZRpqw/tPK9l4oPPcJL1idtZjHli2UppOF692xOG/4Ujf3G9rSaU VUqihD35AgzayPxPBobPcghfQWy6kdAqiYzsTFfKqY5x0YdVC9AqG+E0GHEtGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744133695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yNkan3FG++TRupKgYramsQ3ohp5laSoB9FnuI+PimRk=; b=QmCbtkML3tEWFNIVqBNmv2pdI2/w5sV7S2X2+Q5d3uFQDpT8sy2yYX6+yY4HICAMnFfYym +JfD68Kx6AB+psqROBXE/7YAOcjeHjknCjiX1epWFQsxuXq9h33FicXIq0ONM09p3NC9Fe 7VVNB2fk79lkIjAtBttzWOWqHPsWAXXIAil45NRnS6ngRsrhxnL87HviHQQkYBvnk0huUv pMlEGoJKVWMK+gR4g4QHONFNBhCbCmXVO8FYxbLAUpRviYFxkSi5RFFpzwBYyE+CeSNS1A 2Y81Asya/tOniPC6z8a4GwJG6wtW2NuTOJEpQLscnJiYqIRuafm4P6D3141i5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZXCrZ6QJdzjBQ; Tue, 08 Apr 2025 17:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 538HYsc9067768; Tue, 8 Apr 2025 17:34:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538HYswS067765; Tue, 8 Apr 2025 17:34:54 GMT (envelope-from git) Date: Tue, 8 Apr 2025 17:34:54 GMT Message-Id: <202504081734.538HYswS067765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 4b990663ff63 - main - libc/tests: fix couple errors for getaddrinfo_test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b990663ff63de8db700dc0e386421c201e43412 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4b990663ff63de8db700dc0e386421c201e43412 commit 4b990663ff63de8db700dc0e386421c201e43412 Author: K Rin AuthorDate: 2025-04-05 23:54:11 +0000 Commit: Gleb Smirnoff CommitDate: 2025-04-08 16:49:54 +0000 libc/tests: fix couple errors for getaddrinfo_test - The reason our test is flaky is its dependence on ip6addrctl_policy. - While here, fix shell logic. When our diff(1) prints a diff it returns a nonzero status and this is when we want to atf_fail(). --- lib/libc/tests/net/getaddrinfo/t_getaddrinfo.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/tests/net/getaddrinfo/t_getaddrinfo.sh b/lib/libc/tests/net/getaddrinfo/t_getaddrinfo.sh index 94a3c0b2e52c..79997a9a1631 100755 --- a/lib/libc/tests/net/getaddrinfo/t_getaddrinfo.sh +++ b/lib/libc/tests/net/getaddrinfo/t_getaddrinfo.sh @@ -55,7 +55,7 @@ check_output() fi cmp -s $(atf_get_srcdir)/data/${exp} out && return - diff -u $(atf_get_srcdir)/data/${exp} out && \ + diff -u $(atf_get_srcdir)/data/${exp} out || \ atf_fail "Actual output does not match expected output" } @@ -188,6 +188,7 @@ scopeaddr_body() atf_init_test_cases() { + service ip6addrctl prefer_ipv6 atf_add_test_case basic atf_add_test_case specific atf_add_test_case empty_hostname