From owner-svn-src-projects@freebsd.org Tue Jun 25 18:58:53 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 3CCFF15D427F for ; Tue, 25 Jun 2019 18:58:53 +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 D8EC87098E; Tue, 25 Jun 2019 18:58:52 +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 973A91C819; Tue, 25 Jun 2019 18:58:52 +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 x5PIwqiH066991; Tue, 25 Jun 2019 18:58:52 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5PIwqk3066989; Tue, 25 Jun 2019 18:58:52 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201906251858.x5PIwqk3066989@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 25 Jun 2019 18:58:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r349384 - projects/fuse2/tests/sys/fs/fusefs X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/tests/sys/fs/fusefs X-SVN-Commit-Revision: 349384 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D8EC87098E 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.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; NEURAL_HAM_LONG(-1.00)[-1.000,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: Tue, 25 Jun 2019 18:58:53 -0000 Author: asomers Date: Tue Jun 25 18:58:51 2019 New Revision: 349384 URL: https://svnweb.freebsd.org/changeset/base/349384 Log: fusefs: fix the tests for nondefault values of vfs.maxbcachebuf Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/tests/sys/fs/fusefs/read.cc projects/fuse2/tests/sys/fs/fusefs/write.cc Modified: projects/fuse2/tests/sys/fs/fusefs/read.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/read.cc Tue Jun 25 18:47:40 2019 (r349383) +++ projects/fuse2/tests/sys/fs/fusefs/read.cc Tue Jun 25 18:58:51 2019 (r349384) @@ -163,7 +163,7 @@ TEST_F(AioRead, async_read_disabled) ssize_t bufsize = 50; char buf0[bufsize], buf1[bufsize]; off_t off0 = 0; - off_t off1 = 65536; + off_t off1 = m_maxbcachebuf; struct aiocb iocb0, iocb1; volatile sig_atomic_t read_count = 0; @@ -243,13 +243,14 @@ TEST_F(AsyncRead, async_read) ssize_t bufsize = 50; char buf0[bufsize], buf1[bufsize]; off_t off0 = 0; - off_t off1 = 65536; + off_t off1 = m_maxbcachebuf; + off_t fsize = 2 * m_maxbcachebuf; struct aiocb iocb0, iocb1; sem_t sem; ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno); - expect_lookup(RELPATH, ino, 131072); + expect_lookup(RELPATH, ino, fsize); expect_open(ino, 0, 1); EXPECT_CALL(*m_mock, process( ResultOf([=](auto in) { Modified: projects/fuse2/tests/sys/fs/fusefs/write.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/write.cc Tue Jun 25 18:47:40 2019 (r349383) +++ projects/fuse2/tests/sys/fs/fusefs/write.cc Tue Jun 25 18:58:51 2019 (r349384) @@ -235,10 +235,13 @@ class WriteCluster: public WriteBack { (public) virtual void SetUp() { if (MAXPHYS < 2 * DFLTPHYS) GTEST_SKIP() << "MAXPHYS must be at least twice DFLTPHYS" - << "for this test"; + << " for this test"; m_async = true; m_maxwrite = MAXPHYS; WriteBack::SetUp(); + if (MAXPHYS < 2 * m_maxbcachebuf) + GTEST_SKIP() << "MAXPHYS must be at least twice maxbcachebuf" + << " for this test"; } }; @@ -619,7 +622,7 @@ TEST_F(WriteThrough, pwrite) const char RELPATH[] = "some_file.txt"; const char *CONTENTS = "abcdefgh"; uint64_t ino = 42; - uint64_t offset = 65536; + uint64_t offset = m_maxbcachebuf; int fd; ssize_t bufsize = strlen(CONTENTS); @@ -767,8 +770,8 @@ TEST_F(WriteCluster, clustering) uint64_t ino = 42; int i, fd; void *wbuf, *wbuf2x; - ssize_t bufsize = 65536; - off_t filesize = 327680; + ssize_t bufsize = m_maxbcachebuf; + off_t filesize = 5 * bufsize; wbuf = malloc(bufsize); ASSERT_NE(NULL, wbuf) << strerror(errno); @@ -814,8 +817,8 @@ TEST_F(WriteCluster, DISABLED_cluster_write_err) uint64_t ino = 42; int i, fd; void *wbuf; - ssize_t bufsize = 65536; - off_t filesize = 262144; + ssize_t bufsize = m_maxbcachebuf; + off_t filesize = 4 * bufsize; wbuf = malloc(bufsize); ASSERT_NE(NULL, wbuf) << strerror(errno);