From nobody Thu Oct 29 23:32:53 2026 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 4jG0s14rFcz6xqmN for ; Thu, 29 Oct 2026 23:32:53 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jG0s11tHZz4qBB for ; Thu, 29 Oct 2026 23:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793316773; 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=ktlZzQO429oe01o9WZRLv3xPnMO2+zONYBm7PnrliQA=; b=mq7xi0yFzII8mHOyB94a6e9typHB64uYaR5xacKYIRuspdGn0t32KYDXKIR5IpyFpCLgK9 vIsTy7/ZexquQTl7jZx7NDsN3Bnn0IqNRH7SZgUm44/dkcUO0Qni3+rWD0fOLdJJFf7IA7 0F7qUmOYRK0WGYBlbbh1D8NWzpXGiWpe1BsQJ/bwDSCm+6w0/ysav8r063Q4dvdEdLrvDK 45wkfq9ui8bkZlszt/EY4iscs1kZccdzkz6yXKmk9eXZliWyU2bbTAaRjJftoxs/q9x6YI PzmjJRHOi4E0Uj6We0eiId/BHORXYYBxJtqCm/ImjWLQaeLih6y+s0H1z7f24w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793316773; b=cdMfP/u1LAmrFxJ+dbOiyWLf2VRPSk6zH9O2pogZoaAAUG+h1axHMkOM+hXeYHKkxISmyj Wj0FnIEmAPXqvMin5tR6T5rVP1f0k3FwkjJPKVSJl3vXBKmLhGyABGJOfY41281X/YZMwH fnBFWU3jJ80VeH1KLJMdKRjwnhWzIcN3AU+G6D795CFdWIf2NIHVusuGcc3gyDrN115YY+ kn2pri9W56NG3CATtxcW52Tbw2TmA/ZTzLI8oMR4/CgjRsGwbCKVb5yJzoUniS8bZ8OeGx j+gD80t7aUjqIpG0GGvrJBWjjHOAb8eh99yfDec/yYSmcp/92iUs7pg6ST+Tiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793316773; 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=ktlZzQO429oe01o9WZRLv3xPnMO2+zONYBm7PnrliQA=; b=LuWwOAFFef81wwqnX/aKOrccJmywSnG+7xQzB9eRVAPnzzCYxtnG558/pOzdkCKi+LhUhU fUBBs8u3sVXZIkzYWcA5IxvowzNJorsb5Np1z6y6J5CJPlJ0GOLI4aN4eU+s9WgY+Mcmqz 8DmMO79HqZ+/b6BDhQ8XWyNqDvDRFpGqb3z5cd4hy3PShkJp6Z6rWjnxXGz8kCJ5IgFc2a km56DAbXR/9rj58wwU2X0RiHMCVg/Ci8Y+CXeYQBh8s+FOQjvC8o8rKRm/YgUrjYogErcD w52unOxJiLtfagxT813qLx3+HdVTV3pG8lEalM91FlerPHsDO0JBkTWKW1cYcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jG0s10zYsz12CQ for ; Thu, 29 Oct 2026 23:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39b6a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 23:32:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 3fb03fb35b20 - main - [tests] switch GoogleTest tests to `googletest` interface List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fb03fb35b20d259e0a3a07fc48f2ecc3c5da6e8 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 23:32:53 +0000 Message-Id: <6ae3d7a5.39b6a.63003bda@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3fb03fb35b20d259e0a3a07fc48f2ecc3c5da6e8 commit 3fb03fb35b20d259e0a3a07fc48f2ecc3c5da6e8 Author: Enji Cooper AuthorDate: 2026-10-07 18:53:15 +0000 Commit: Enji Cooper CommitDate: 2026-10-29 23:32:11 +0000 [tests] switch GoogleTest tests to `googletest` interface The new `googletest` kyua test interface--added in 0.15.0 and fixed in 0.15.1--allows tests to be executed and handled in a more fine-grained manner than the way it was prior to this commit. This change deletes the `capsicum-test` ATF wrapper script, `functional.sh`, and all supporting logic in `googletest.test.mk` as well as this change makes that logic unnecessary. MFC after: 1 month MFC with: b68969979d6b ("contrib/kyua: update to 0.15.1") --- share/mk/googletest.test.mk | 11 +------- tests/sys/capsicum/Makefile | 1 - tests/sys/capsicum/functional.sh | 60 ---------------------------------------- 3 files changed, 1 insertion(+), 71 deletions(-) diff --git a/share/mk/googletest.test.mk b/share/mk/googletest.test.mk index 026f6dcacce3..b21576112a78 100644 --- a/share/mk/googletest.test.mk +++ b/share/mk/googletest.test.mk @@ -6,10 +6,6 @@ # GoogleTest is a C++ test framework, thus, it does not describe/articulate how # to write tests in other languages, e.g., C or shell, unlike the ATF, plain, # and TAP raw test interfaces. -# -# For now this is a thin wrapper around the `plain` test interface, but in the -# future this will rely on a newer version of kyua which will integrate in -# GoogleTest support. .if !target(____) .error googletest.test.mk cannot be included directly. @@ -34,13 +30,8 @@ BINDIR.${_T}= ${TESTSDIR} CXXFLAGS.${_T}+= ${GTESTS_CXXFLAGS} MAN.${_T}?= # empty SRCS.${_T}?= ${_T}.cc -.if !empty(GTESTS_WRAPPER_SH.${_T}) -# A stopgap/workaround to let kyua execute test case one by one -ATF_TESTS_SH+= ${GTESTS_WRAPPER_SH.${_T}} -.else _TESTS+= ${_T} -TEST_INTERFACE.${_T}= plain -.endif +TEST_INTERFACE.${_T}= googletest .endfor .endif diff --git a/tests/sys/capsicum/Makefile b/tests/sys/capsicum/Makefile index a8f72d399af9..788fa9f9394c 100644 --- a/tests/sys/capsicum/Makefile +++ b/tests/sys/capsicum/Makefile @@ -10,7 +10,6 @@ CFLAGS+= -I${SRCTOP}/tests .if ${MK_GOOGLETEST} != no GTESTS+= capsicum-test -GTESTS_WRAPPER_SH.capsicum-test= functional # This test script runs the same test suite twice, once as root and once as an # unprivileged user. Serialize them since some tests access global namespaces, # e.g., mqueuefs, and can trample on each other. diff --git a/tests/sys/capsicum/functional.sh b/tests/sys/capsicum/functional.sh deleted file mode 100755 index 8d4a7eef2dec..000000000000 --- a/tests/sys/capsicum/functional.sh +++ /dev/null @@ -1,60 +0,0 @@ -#- -# SPDX-License-Identifier: BSD-2-Clause -# -# Copyright (c) 2020 The FreeBSD Foundation -# -# This software was developed by Li-Wen Hsu -# under sponsorship from the FreeBSD Foundation. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# - -CAPSICUM_TEST_BIN=capsicum-test - -atf_test_case "test_root" -test_root_head() { - - atf_set descr 'Run capsicum-test as root' - atf_set require.user root -} - -test_root_body() { - atf_check -s exit:0 -o match:PASSED -e ignore \ - "$(atf_get_srcdir)/${CAPSICUM_TEST_BIN}" -u "$(id -u tests)" -} - -atf_test_case "test_unprivileged" -test_unprivileged_head() { - - atf_set descr 'Run capsicum-test as an unprivileged user' - atf_set require.user unprivileged -} - -test_unprivileged_body() { - atf_check -s exit:0 -o match:PASSED -e ignore \ - "$(atf_get_srcdir)/${CAPSICUM_TEST_BIN}" -u "$(id -u)" -} - -atf_init_test_cases() { - atf_add_test_case test_root - atf_add_test_case test_unprivileged -}