The branch main has been updated by asomers:
URL:
https://cgit.FreeBSD.org/src/commit/?id=35c4ea02cb9fe199dd88b19cf51fef56838c8cba
commit 35c4ea02cb9fe199dd88b19cf51fef56838c8cba
Author: Alan Somers <asom...@freebsd.org>
AuthorDate: 2025-06-05 14:44:43 +0000
Commit: Alan Somers <asom...@freebsd.org>
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);
