From nobody Thu Jun 5 21:30:17 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 4bCyKQ0qQrz5yPg1; Thu, 05 Jun 2025 21:30: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 4bCyKQ0D3pz3Dps; Thu, 05 Jun 2025 21:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749159018; 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=6wI1F7SQyNccA5mTor7II2psMWscq4nte47yXLsbwl4=; b=od8YdQZxQ0GEDw4JTuch2BNP+TyB1lWLTShHRg9kIWuEOUoRcopfr+C4kTv6wG+Anvnzq2 xWCG+FaKvbu054/9XJP4akexW1bjEE6nEkThtcnlFJALy/laSxvT0FSD5mzOZyDElCGdMZ YxffBj1bNGz+3m4S4HbrU9ig902pg87qYY8EvxlMhns9XhDwz5Dgdzxn1HiJ4IDE7yrX1V 2dAMpQJZ4FbX8TLE+f7JH83vt89kywRlEwM5g0OHD9Mpkge98YHnDSN/wGuP2uXeqycqyL oIbyUiY+0ShKuilIkTspgCSIS2YohBM2ma3arEHzteBK1X/G5Gr66KFX1wFEQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749159018; 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=6wI1F7SQyNccA5mTor7II2psMWscq4nte47yXLsbwl4=; b=SkNb++oios3qwwIkk3mwzlRhnaIRB0TlH2FdVFQQ+lKbtJitJW8o26adZgtujS+3yFdlq4 akVpcCSaiZYn2j6cVopzp3bAIgHdRImyU18W+D9gQzCqaDMvZE3pDfZUKggv6dgYgYwsKY DN4s0LAA0uGM8Bp3vH+OhiStVUMz4StAcaxHyfGkmBQJpE28HLqMR8wnNmezKJJJ+KDOyy K/B9JaXaYh4Q3l7eOo3iyVYWsOQKShBJ6qXQFRu0MMx7EAgfJ/u5lAcWjxlIBWo7asia0B 0MfTpzrdRZUVIZwZIbZFZPKIFVCImcWPQ6GCSs2nGAH7z0vdS+VHv/kXedJAAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749159018; a=rsa-sha256; cv=none; b=J+f1ms6rzIM2f3FbqZAhQjU87Y3N5rSVPPIRLkraLp7H/NFU3fKBAJaRNFip3LXLbS0Ahu A3Km+QOQE31zFZPWUocmIWBLqg9CdYJ849gTrCuy24F2hPwV31XJZOuHPbSfCw2rD3r72c 1V+hafRcTaQA6Ypcln0pmCDt1OyIQuJuaa2FlxrUzxRAc8uNbr8ZyziDRR6xpbR6kylVPD Vc9VapQxDUwytlCAChBEhEt0ivUNS+C1WAmb5HMFz0/csrVBeOwIjpkSEze1TEhC2PNQmq PR70cH8Eys+KnHk4PApZFDbsm52YqdqnAHRYyFOmaxOs75oiaX+K5ZQbdw2BOw== 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 4bCyKP6mX4z9g2; Thu, 05 Jun 2025 21:30:17 +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 555LUHIQ036574; Thu, 5 Jun 2025 21:30:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 555LUHTH036568; Thu, 5 Jun 2025 21:30:17 GMT (envelope-from git) Date: Thu, 5 Jun 2025 21:30:17 GMT Message-Id: <202506052130.555LUHTH036568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 35c4ea02cb9f - main - fusefs: revert a workaround for a googletest bug 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35c4ea02cb9fe199dd88b19cf51fef56838c8cba Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=35c4ea02cb9fe199dd88b19cf51fef56838c8cba commit 35c4ea02cb9fe199dd88b19cf51fef56838c8cba Author: Alan Somers AuthorDate: 2025-06-05 14:44:43 +0000 Commit: Alan Somers CommitDate: 2025-06-05 21:17:47 +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 --- 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);