From nobody Wed Jul 23 22:58:53 2025 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 4bnV1V0MH0z636C7; Wed, 23 Jul 2025 22:58:54 +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 4bnV1T6Tlrz3LTC; Wed, 23 Jul 2025 22:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753311533; 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=Zg8cHotNaOJ0O6+yhjFtAajLvMse/RtJxm2nkDDPbus=; b=sodWXtdpfz8R40aLmwsfcQuO856Wg5+c/9dy4F18YfbkAxkcb0ENVRx2u6S7kh5kmtaPZh G134oKl6KxbAGS7LJJ9sdlu7TFMOU5XKe8F4iBEk9STtLS6uJ50PDaQK4CwQETErCK+hH2 pkaM0P7orDQXf/cLpxVTXoy1CsukaYFfFcs0zBg2X8D3PaleYNp2XX3U2h29knS3Xw0TFJ lL/PGxiNra/xmCgeEQbIlkWPYrpNls41iKXL3rHEXdZbQIqTUqLbmdqxbAbCr58EbdjLEr g3I8h9RXdwrf6gDCWI7R7hGjfrbgqydUtvTMw5aLhZv7fq1CAUFGbYMDoIn/rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753311533; 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=Zg8cHotNaOJ0O6+yhjFtAajLvMse/RtJxm2nkDDPbus=; b=Xo7gNI10guAgGmyY5YyFGB5QK7rGbrZgaoMmNiPV5huwi6c+HqObCh3H1NXY2AtPDPbbLW lM/dKeJcGPkflCDUO4xZXrD9NLmuhdVYQVQGNGw/6EimlXDroaLAz8WnNQ46PtlggFb2Zr CQ1+VewhqFoOh/2AwY3JX9CcAC5Z9OOp0lV41WHIhYbKFfF9fL4hVeHC4TLyDub53X6pN7 n3hu23ys6LdC8y+QkiKmW+wwdpTIxOHVmmd066gSKht7bEPfOPyj869hAduS4ZbnDA1ptL qVWgCae7+q06oJj3cys0WO6kUxhh/sr5Rjwq/v8hPDHpjzFiLk+bsfhn4xnnGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753311533; a=rsa-sha256; cv=none; b=h+/GvzlHzS7Wv5ESgseifEvlEmFjLuqvEKGd1R/XfSwpTBTiFK+ZicGZ8LyOzNmMdgBriL mKBsoq53AE3m0sX3gwvIUZg/AcQeLQnQx61zZN6VkxPuQvh0KcS2MYHuIBQsZC/xE2FaAE dLeFUw2xYtczONPYn4dNlHkgi+5ON2Dg/SpZyiNFtmnIUcKM5kum6LhYhngkTZQbedhpq/ rh8092KNdiaZd5sdTUXFqP6EfgqEXz9+QXi+1MeCN5f2GEP+54ReP1B8dAT1mivGutfTix Gz1HvKRmfpWPAOy2I+kK65N7N2OK17iFBSlm7FlDl1mY+Gsj+p9pawM+lfFgww== 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 4bnV1T5vQFzYww; Wed, 23 Jul 2025 22:58:53 +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 56NMwrUe094896; Wed, 23 Jul 2025 22:58:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56NMwr9h094893; Wed, 23 Jul 2025 22:58:53 GMT (envelope-from git) Date: Wed, 23 Jul 2025 22:58:53 GMT Message-Id: <202507232258.56NMwr9h094893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f1e63fcb0c4a - stable/14 - fusefs: revert a workaround for a googletest bug 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f1e63fcb0c4a52d040f3ca9513043c799259471b Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f1e63fcb0c4a52d040f3ca9513043c799259471b commit f1e63fcb0c4a52d040f3ca9513043c799259471b Author: Alan Somers AuthorDate: 2025-06-05 14:44:43 +0000 Commit: Alan Somers CommitDate: 2025-07-23 22:56:29 +0000 fusefs: revert a workaround for a googletest bug This bug was fixed by googletest back in 2019 and released in googletest 1.10.0, I think. Using GTEST_SKIP from a test environment works now. https://github.com/google/googletest/issues/2189 MFC after: 2 weeks Sponsored by: ConnectWise (cherry picked from commit 35c4ea02cb9fe199dd88b19cf51fef56838c8cba) --- tests/sys/fs/fusefs/utils.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tests/sys/fs/fusefs/utils.cc b/tests/sys/fs/fusefs/utils.cc index d059221b2e55..d702dec50247 100644 --- a/tests/sys/fs/fusefs/utils.cc +++ b/tests/sys/fs/fusefs/utils.cc @@ -124,6 +124,7 @@ bool is_unsafe_aio_enabled(void) { class FuseEnv: public Environment { virtual void SetUp() { + check_environment(); } }; @@ -132,14 +133,6 @@ void FuseTest::SetUp() { const char *maxphys_node = "kern.maxphys"; size_t size; - /* - * XXX check_environment should be called from FuseEnv::SetUp, but - * can't due to https://github.com/google/googletest/issues/2189 - */ - check_environment(); - if (IsSkipped()) - return; - size = sizeof(m_maxbcachebuf); ASSERT_EQ(0, sysctlbyname(maxbcachebuf_node, &m_maxbcachebuf, &size, NULL, 0)) << strerror(errno);