From nobody Fri Oct 30 02:20:22 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 4jG4ZK1GC0z6y31B; Fri, 30 Oct 2026 02:20:25 +0000 (UTC) (envelope-from markj@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4jG4ZK0NmNz4MBV; Fri, 30 Oct 2026 02:20:25 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793326825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=s45H5OSrrWXE31t9ZHSV5hKXvZVpXXkEDovnk3f6ZnE=; b=j6NRPePORtJinHUuVO4ffAqOistyDdwC6LrAKNnSI5lsf2DBXZlW2pVCYkYeFzgvAJz+DK gjrD3Xw/qzUriu6Kc5JYubg/NXX7wuSYhiFl9k6/Nk15leTkEyUqbZR+l0ipV9W5Xu6IIu cbFroJMIq679UQytOHKTI6eHdXvYSR1wvasTKdVVj+5IgpFZpoqxmH3/2/UHTVotJYugOG BJbn7Uv37Nfwmsjl/PBtlUC71Fg2rjqtBAZdIKiXSItbAIdzYvMIP1czFdZQQB7xo5Ivss jwCofH6UJkq39HGPtCgX7gPPqAxIGwtFsGzOc2EAFqAeehvBIubKiOBttOOfpA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793326825; b=hjm/mBwNG7r8vaWi42Rij9dTOZNr9i0ERb+t79Pjn1GWJpE9Sl1VkOjDvNeVjseH8XEODU 17ZHAbZt86L1IRQZmneoTAIxvpR2Z1IPmcPQ5H1xxUS0E7gLalh0T4Ft4W27LtrU8a2RLn fr7LBZjOizS8wS8ISrCbzEcOwHdETYfxigEZewLDu9hkjmCRG9uZPJHQQntMuw7IF7/Lqf LAOBmUUsRpsRGly+ubvXtU9f9mNOl1lsD7IfRiaZ+4WEpJCzn6G62ICN+c3XIupxPT5ypV eTwv9XpIZqtU8YfJzFUWsTXPPTf0zaF/ii6sPPTVm1Rfm9+pfKTAt7z+KkpsAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793326825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=s45H5OSrrWXE31t9ZHSV5hKXvZVpXXkEDovnk3f6ZnE=; b=IVWDWjes/Nsh3Ej2dn0JU3VPeJOO5nIuHzp+8WUY++ucx9D/zmYHRiMuCePx7ZBwF548kx 7kdOWfId3fXdVn9UmloD5hmhnSaAsVcqw7hOkojN2zgXclxOPUkrHUb/Q9T3R/11l7c1aC 9gYUpWnN53iu+H1NXXUH6xs+skD3VUmMtEFKcdfibnNBLq2f4WrCczN2lys9wlJExQhhbT CmTzlv0pHXHx590pKJQesJML3v2Q1INdfjXncS3XrVQmebIet6HpUezwYXXLl/+oTMm0qo 89/3xFWfQdkQCt1g/PWa8Bd9bB3zt7pT/hWdLoXqn8iwpZL9Ssw2TWh9613zPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from nuc (198-84-224-249.cpe.teksavvy.com [198.84.224.249]) (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) (Authenticated sender: markj) by smtp.freebsd.org (Postfix) with ESMTPSA id 4jG4ZJ4dYlzhBK; Fri, 30 Oct 2026 02:20:24 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Thu, 29 Oct 2026 22:20:22 -0400 From: Mark Johnston To: Enji Cooper Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3fb03fb35b20 - main - [tests] switch GoogleTest tests to `googletest` interface Message-ID: References: <6ae3d7a5.39b6a.63003bda@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <6ae3d7a5.39b6a.63003bda@gitrepo.freebsd.org> On Thu, Oct 29, 2026 at 11:32:53PM +0000, Enji Cooper wrote: > 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 Please follow the guidelines for commit log messages: https://docs.freebsd.org/en/articles/committers-guide/#_prefix_the_subject_line_with_a_component_if_applicable > 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. Below this there are some TEST_METADATA.functional configuration variables still set. After this commit I see a whole bunch of newly skipped tests, it looks like a regression: lib/googletest/gtest_main/googletest-printers-test:PrintStlContainerTest.StdSpan sys/capsicum/capsicum-test:Capability.NoBypassDACIfRoot sys/capsicum/capsicum-test:Capability.SyscallAtIfRoot sys/capsicum/capsicum-test:ForkedWithFiles_AllowedSocketSyscallsIfRoot._ sys/capsicum/capsicum-test:Pdfork.OtherUserIfRootForked sys/fs/fusefs/default_permissions:Access.eacces sys/fs/fusefs/default_permissions:Access.eacces_no_cached_attrs sys/fs/fusefs/default_permissions:Access.ok sys/fs/fusefs/default_permissions:Chgrp.clear_suid sys/fs/fusefs/default_permissions:Chgrp.eperm sys/fs/fusefs/default_permissions:Chgrp.ok sys/fs/fusefs/default_permissions:Chown.chown_to_self sys/fs/fusefs/default_permissions:Chown.clear_suid sys/fs/fusefs/default_permissions:Chown.eperm sys/fs/fusefs/default_permissions:CopyFileRange.clear_sgid sys/fs/fusefs/default_permissions:CopyFileRange.clear_suid sys/fs/fusefs/default_permissions:Create.eacces sys/fs/fusefs/default_permissions:Create.ok sys/fs/fusefs/default_permissions:Deleteextattr.eacces sys/fs/fusefs/default_permissions:Deleteextattr.ok sys/fs/fusefs/default_permissions:Deleteextattr.system sys/fs/fusefs/default_permissions:Deleteextattr.user sys/fs/fusefs/default_permissions:Fspacectl.clear_sgid sys/fs/fusefs/default_permissions:Fspacectl.clear_suid sys/fs/fusefs/default_permissions:Fspacectl.posix_fallocate_of_newly_created_file sys/fs/fusefs/default_permissions:Getextattr.eacces sys/fs/fusefs/default_permissions:Getextattr.ok sys/fs/fusefs/default_permissions:Getextattr.system sys/fs/fusefs/default_permissions:Listextattr.eacces sys/fs/fusefs/default_permissions:Listextattr.ok sys/fs/fusefs/default_permissions:Listextattr.system sys/fs/fusefs/default_permissions:Lookup.eacces sys/fs/fusefs/default_permissions:Open.eacces sys/fs/fusefs/default_permissions:Open.ok sys/fs/fusefs/default_permissions:PosixFallocate.clear_sgid sys/fs/fusefs/default_permissions:PosixFallocate.clear_suid sys/fs/fusefs/default_permissions:PosixFallocate.posix_fallocate_of_newly_created_file sys/fs/fusefs/default_permissions:Read.atime_during_close sys/fs/fusefs/default_permissions:Rename.eacces_on_dstdir_for_creating sys/fs/fusefs/default_permissions:Rename.eacces_on_dstdir_for_removing sys/fs/fusefs/default_permissions:Rename.eacces_on_srcdir sys/fs/fusefs/default_permissions:Rename.eperm_for_subdirectory sys/fs/fusefs/default_permissions:Rename.eperm_on_sticky_dstdir sys/fs/fusefs/default_permissions:Rename.eperm_on_sticky_srcdir sys/fs/fusefs/default_permissions:Rename.ok sys/fs/fusefs/default_permissions:Rename.ok_to_remove_src_because_of_stickiness sys/fs/fusefs/default_permissions:Rename.subdirectory_to_same_dir sys/fs/fusefs/default_permissions:Setattr.eacces sys/fs/fusefs/default_permissions:Setattr.ftruncate_of_newly_created_file sys/fs/fusefs/default_permissions:Setattr.ok sys/fs/fusefs/default_permissions:Setattr.sgid_by_non_group_member sys/fs/fusefs/default_permissions:Setattr.sticky_regular_file sys/fs/fusefs/default_permissions:Setextattr.eacces sys/fs/fusefs/default_permissions:Setextattr.ok sys/fs/fusefs/default_permissions:Setextattr.system sys/fs/fusefs/default_permissions:Setextattr.user sys/fs/fusefs/default_permissions:Unlink.cached_unwritable_directory sys/fs/fusefs/default_permissions:Unlink.ok sys/fs/fusefs/default_permissions:Unlink.sticky_directory sys/fs/fusefs/default_permissions:Unlink.sticky_directory_io_during_getattr sys/fs/fusefs/default_permissions:Unlink.unwritable_directory sys/fs/fusefs/default_permissions:Utimensat.utime_now sys/fs/fusefs/default_permissions:Utimensat.utime_omit sys/fs/fusefs/default_permissions:Write.clear_sgid sys/fs/fusefs/default_permissions:Write.clear_suid sys/fs/fusefs/default_permissions:Write.recursion_panic_while_clearing_suid sys/fs/fusefs/locks:Flock.DISABLED_eagain sys/fs/fusefs/locks:Flock.DISABLED_set sys/fs/fusefs/mknod:Mknod.DISABLED_whiteout sys/fs/fusefs/notify:N/Notify.DISABLED_store_nonexistent/0 sys/fs/fusefs/notify:N/Notify.DISABLED_store_nonexistent/1 sys/fs/fusefs/notify:N/Notify.DISABLED_store_with_blank_cache/0 sys/fs/fusefs/notify:N/Notify.DISABLED_store_with_blank_cache/1 sys/fs/fusefs/open:Open.DISABLED_o_append sys/fs/fusefs/open:Open.DISABLED_o_direct sys/fs/fusefs/open:Open.DISABLED_o_trunc sys/fs/fusefs/release:Release.DISABLED_flags sys/fs/fusefs/write:AioWrite.DISABLED_aio_write