From owner-svn-src-all@freebsd.org Tue Aug 13 15:52:30 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8D038B3A41; Tue, 13 Aug 2019 15:52:30 +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 467HKV389Xz42GS; Tue, 13 Aug 2019 15:52:30 +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 356D819BD0; Tue, 13 Aug 2019 15:52:30 +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 x7DFqUoF018013; Tue, 13 Aug 2019 15:52:30 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7DFqTvE018007; Tue, 13 Aug 2019 15:52:29 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201908131552.x7DFqTvE018007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Aug 2019 15:52:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r350992 - head/tests/sys/fs/fusefs X-SVN-Group: head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/tests/sys/fs/fusefs X-SVN-Commit-Revision: 350992 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Aug 2019 15:52:30 -0000 Author: asomers Date: Tue Aug 13 15:52:28 2019 New Revision: 350992 URL: https://svnweb.freebsd.org/changeset/base/350992 Log: fusefs: skip some tests when unsafe aio is disabled MFC after: 15 days MFC-With: r350665 Sponsored by: The FreeBSD Foundation Modified: head/tests/sys/fs/fusefs/fsync.cc head/tests/sys/fs/fusefs/fsyncdir.cc head/tests/sys/fs/fusefs/read.cc head/tests/sys/fs/fusefs/utils.cc head/tests/sys/fs/fusefs/utils.hh head/tests/sys/fs/fusefs/write.cc Directory Properties: head/ (props changed) Modified: head/tests/sys/fs/fusefs/fsync.cc ============================================================================== --- head/tests/sys/fs/fusefs/fsync.cc Tue Aug 13 15:50:47 2019 (r350991) +++ head/tests/sys/fs/fusefs/fsync.cc Tue Aug 13 15:52:28 2019 (r350992) @@ -82,8 +82,17 @@ void expect_write(uint64_t ino, uint64_t size, const v }; +class AioFsync: public Fsync { +virtual void SetUp() { + if (!is_unsafe_aio_enabled()) + GTEST_SKIP() << + "vfs.aio.enable_unsafe must be set for this test"; + FuseTest::SetUp(); +} +}; + /* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236379 */ -TEST_F(Fsync, aio_fsync) +TEST_F(AioFsync, aio_fsync) { const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; Modified: head/tests/sys/fs/fusefs/fsyncdir.cc ============================================================================== --- head/tests/sys/fs/fusefs/fsyncdir.cc Tue Aug 13 15:50:47 2019 (r350991) +++ head/tests/sys/fs/fusefs/fsyncdir.cc Tue Aug 13 15:52:28 2019 (r350992) @@ -77,8 +77,17 @@ void expect_lookup(const char *relpath, uint64_t ino) }; +class AioFsyncDir: public FsyncDir { +virtual void SetUp() { + if (!is_unsafe_aio_enabled()) + GTEST_SKIP() << + "vfs.aio.enable_unsafe must be set for this test"; + FuseTest::SetUp(); +} +}; + /* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236379 */ -TEST_F(FsyncDir, aio_fsync) +TEST_F(AioFsyncDir, aio_fsync) { const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; Modified: head/tests/sys/fs/fusefs/read.cc ============================================================================== --- head/tests/sys/fs/fusefs/read.cc Tue Aug 13 15:50:47 2019 (r350991) +++ head/tests/sys/fs/fusefs/read.cc Tue Aug 13 15:52:28 2019 (r350992) @@ -73,17 +73,10 @@ void expect_lookup(const char *relpath, uint64_t ino, class AioRead: public Read { public: virtual void SetUp() { - const char *node = "vfs.aio.enable_unsafe"; - int val = 0; - size_t size = sizeof(val); - - FuseTest::SetUp(); - - ASSERT_EQ(0, sysctlbyname(node, &val, &size, NULL, 0)) - << strerror(errno); - if (!val) + if (!is_unsafe_aio_enabled()) GTEST_SKIP() << "vfs.aio.enable_unsafe must be set for this test"; + FuseTest::SetUp(); } }; Modified: head/tests/sys/fs/fusefs/utils.cc ============================================================================== --- head/tests/sys/fs/fusefs/utils.cc Tue Aug 13 15:50:47 2019 (r350991) +++ head/tests/sys/fs/fusefs/utils.cc Tue Aug 13 15:52:28 2019 (r350992) @@ -89,6 +89,18 @@ void check_environment() GTEST_SKIP() << "current user is not allowed to mount"; } +bool is_unsafe_aio_enabled(void) { + const char *node = "vfs.aio.enable_unsafe"; + int val = 0; + size_t size = sizeof(val); + + if (sysctlbyname(node, &val, &size, NULL, 0)) { + perror("sysctlbyname"); + return (false); + } + return (val != 0); +} + class FuseEnv: public Environment { virtual void SetUp() { } Modified: head/tests/sys/fs/fusefs/utils.hh ============================================================================== --- head/tests/sys/fs/fusefs/utils.hh Tue Aug 13 15:50:47 2019 (r350991) +++ head/tests/sys/fs/fusefs/utils.hh Tue Aug 13 15:52:28 2019 (r350992) @@ -44,6 +44,8 @@ inline void nap() usleep(NAP_NS / 1000); } +bool is_unsafe_aio_enabled(void); + extern const uint32_t libfuse_max_write; extern const uint32_t default_max_write; class FuseTest : public ::testing::Test { Modified: head/tests/sys/fs/fusefs/write.cc ============================================================================== --- head/tests/sys/fs/fusefs/write.cc Tue Aug 13 15:50:47 2019 (r350991) +++ head/tests/sys/fs/fusefs/write.cc Tue Aug 13 15:52:28 2019 (r350992) @@ -35,7 +35,6 @@ extern "C" { #include #include #include -#include #include #include @@ -138,17 +137,10 @@ void expect_lookup(const char *relpath, uint64_t ino, class AioWrite: public Write { virtual void SetUp() { - const char *node = "vfs.aio.enable_unsafe"; - int val = 0; - size_t size = sizeof(val); - - FuseTest::SetUp(); - - ASSERT_EQ(0, sysctlbyname(node, &val, &size, NULL, 0)) - << strerror(errno); - if (!val) + if (!is_unsafe_aio_enabled()) GTEST_SKIP() << "vfs.aio.enable_unsafe must be set for this test"; + FuseTest::SetUp(); } };