From owner-svn-src-projects@freebsd.org Thu Mar 14 15:00:00 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0117154645E for ; Thu, 14 Mar 2019 15:00:00 +0000 (UTC) (envelope-from asomers@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 42774832C8; Thu, 14 Mar 2019 15:00:00 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 35BD12408A; Thu, 14 Mar 2019 15:00:00 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2EExxP7021206; Thu, 14 Mar 2019 14:59:59 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2EExxui021205; Thu, 14 Mar 2019 14:59:59 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201903141459.x2EExxui021205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 14 Mar 2019 14:59:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345133 - projects/fuse2/tests/sys/fs/fuse X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/tests/sys/fs/fuse X-SVN-Commit-Revision: 345133 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 42774832C8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Mar 2019 15:00:00 -0000 Author: asomers Date: Thu Mar 14 14:59:59 2019 New Revision: 345133 URL: https://svnweb.freebsd.org/changeset/base/345133 Log: fuse(4): skip the Write.append test unless vfs.fuse.sync_resize==0 Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/tests/sys/fs/fuse/write.cc Modified: projects/fuse2/tests/sys/fs/fuse/write.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/write.cc Thu Mar 14 14:34:36 2019 (r345132) +++ projects/fuse2/tests/sys/fs/fuse/write.cc Thu Mar 14 14:59:59 2019 (r345133) @@ -65,6 +65,18 @@ void expect_release(uint64_t ino, ProcessMockerT r) ).WillRepeatedly(Invoke(r)); } +void require_sync_resize_0() { + const char *sync_resize_node = "vfs.fuse.sync_resize"; + int val = 0; + size_t size = sizeof(val); + + ASSERT_EQ(0, sysctlbyname(sync_resize_node, &val, &size, NULL, 0)) + << strerror(errno); + if (val != 0) + FAIL() << "vfs.fuse.sync_resize must be set to 0 for this test." + " That sysctl will probably be removed soon."; +} + }; class AioWrite: public Write { @@ -87,7 +99,6 @@ class WriteThrough: public Write { virtual void SetUp() { const char *cache_mode_node = "vfs.fuse.data_cache_mode"; - const char *sync_resize_node = "vfs.fuse.sync_resize"; int val = 0; size_t size = sizeof(val); @@ -98,12 +109,6 @@ virtual void SetUp() { FAIL() << "vfs.fuse.data_cache_mode must be set to 1 " "(writethrough) for this test"; - ASSERT_EQ(0, sysctlbyname(sync_resize_node, &val, &size, NULL, 0)) - << strerror(errno); - if (val != 0) - FAIL() << "vfs.fuse.sync_resize must be set to 0 for this test." - " That sysctl will probably be removed soon."; - FuseTest::SetUp(); } @@ -182,6 +187,8 @@ TEST_F(Write, append) */ uint64_t initial_offset = m_maxbcachebuf; int fd; + + require_sync_resize_0(); expect_lookup(RELPATH, ino); expect_open(ino, 0, 1);