From nobody Fri Oct 11 15:26:18 2024 X-Original-To: dev-commits-src-all@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 4XQ9Sp3qL0z5Z2Bm; Fri, 11 Oct 2024 15:26:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQ9Sp38QMz4nbH; Fri, 11 Oct 2024 15:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728660378; 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=fdTydFQKd7xDcJm34ywAo5bda/vWBiR0lbWAAiAb26w=; b=Z3imhT6ylIWcgeFBE1SvSXp1zUxTMARHy1bl8CwasM7tYuhqBxyqAS1ETk3S2Yr/yryMni 1TIKZNfvoRPy2B1eKP8caTYV0jrPNPI/PpIMf8OyhGdyua92ScRHf0HyktLrpmZmeeFvci t7jlAu8Z1k+DIFzzUtEedH3WMVV/D5pI9ekEtO87M4pjMiC8mOgTzW0so6Pii8l+ryzdni razRLVYP27dGNFO8RcwmggOmc+Kcu4VCcbssRvg58CxGK6/yGsRh+AUFlp/L12ykqSoF1e 5PSl6lQCq1HfCc+Vjotl1cryLGtxDCVEBUShu9ewaoFLqF4p8sKHGkegsIwVkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728660378; 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=fdTydFQKd7xDcJm34ywAo5bda/vWBiR0lbWAAiAb26w=; b=oYUwmhM22+EYcZ1kdJ+yvPTi0fZQfBsOlLq14lgMIyQt6/aOPcltFHjIjWLQ4MMUyBYhSS NDQMGt7sBoFTcHTxxoe0DHPkZ77wpOcf4dEKPMC4hp1pkjY+66t2n6J9guD0ZTu5IoRwOz EpFA03Fsckfrjy0SkBztco5rhADOxuuTD0I9xRdN6OClGA2N0T/e73oG89ghCvBl4G7+25 5NUUoeQhUNhaPLOPe6fRCKPSykERD3euN53qn7GdReRe7DTew1CyiKrfZjODbBj7bTQFGn hJra3vu/+XJBJ18pmvnk/wYdigq+XQnO3Dr5gUvCjtGBf7asfdAmlrZjyOjW9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728660378; a=rsa-sha256; cv=none; b=DJCXY422iTlu0MnVNYLg3UnTXkGG140uutTgJc+GM2Yfj0c9UelW0IjFPHXTXeXEMuHY5q fMF2lnokn9eaiEHwWV5mQaG9K3mI2+c6Q9+rVGUjpQQQPOENjJIpHc70qcOH5EUzIsfHV5 K+kqcmPkYnNKOwE0TXz74sv+tPdb+F/j5KZmuL24Ix9vTFeN37pVg5I7VikO6kYiIXtCK+ 3xIuR2A8TMq6TWATA/z6zN5KtSW1f/LLtIK7T9xC+BK//c1LNlvX4uHgOm0gqR6bH4kOIK 9x9PgbzErYS7bsiXbuUrOfl9W9At13CZFlFflg2cW7mwdiyoApAnjJqenFemNA== 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 4XQ9Sp2lzYznKQ; Fri, 11 Oct 2024 15:26:18 +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 49BFQIrB037764; Fri, 11 Oct 2024 15:26:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BFQIhr037761; Fri, 11 Oct 2024 15:26:18 GMT (envelope-from git) Date: Fri, 11 Oct 2024 15:26:18 GMT Message-Id: <202410111526.49BFQIhr037761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e7f3888b31c2 - stable/14 - capsicum-test: skip SCTP tests if SCTP not available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e7f3888b31c23ef3e26dc2bc04accf03ef943517 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e7f3888b31c23ef3e26dc2bc04accf03ef943517 commit e7f3888b31c23ef3e26dc2bc04accf03ef943517 Author: Ed Maste AuthorDate: 2024-10-07 20:04:05 +0000 Commit: Ed Maste CommitDate: 2024-10-11 15:24:55 +0000 capsicum-test: skip SCTP tests if SCTP not available Skip the test rather than failing if SCTP is not available (e.g., if sctp.ko is not loaded). Also submitted upstream as https://github.com/google/capsicum-test/pull/61 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46999 (cherry picked from commit 1d83090d850f627b6d6ebe7837e807df5d29799f) --- contrib/capsicum-test/sctp.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/capsicum-test/sctp.cc b/contrib/capsicum-test/sctp.cc index 5f0d169456a8..76302059fa19 100644 --- a/contrib/capsicum-test/sctp.cc +++ b/contrib/capsicum-test/sctp.cc @@ -61,6 +61,9 @@ static int SctpClient(int port, unsigned char byte) { TEST(Sctp, Socket) { int sock = socket(AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP); + if (sock == -1 && errno == EPROTONOSUPPORT) { + GTEST_SKIP() << "socket(..., IPPROTO_SCTP) -> EPROTONOSUPPORT"; + } EXPECT_OK(sock); if (sock < 0) return;