From cf437e2aaca730a83b1d7af175ca60bc3046c31c Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Fri, 26 Apr 2019 19:54:46 +0000 Subject: [PATCH] fusefs: enable the Write.mmap test This test had been disabled because it was designed to check protocol 7.9-specific functionality. Enable it without the 7.9-specific bit. Sponsored by: The FreeBSD Foundation --- tests/sys/fs/fusefs/write.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc index b5290c0afcc7..37d817484a8c 100644 --- a/tests/sys/fs/fusefs/write.cc +++ b/tests/sys/fs/fusefs/write.cc @@ -361,7 +361,7 @@ TEST_F(Write, direct_io_short_write_iov) */ /* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236378 */ // TODO: check vfs.fusefs.mmap_enable -TEST_F(Write, DISABLED_mmap) +TEST_F(Write, mmap) { const char FULLPATH[] = "mountpoint/some_file.txt"; const char RELPATH[] = "some_file.txt"; @@ -387,9 +387,10 @@ TEST_F(Write, DISABLED_mmap) expect_read(ino, 0, len, len, zeros); /* * Writes from the pager may or may not be associated with the correct - * pid, so they must set FUSE_WRITE_CACHE + * pid, so they must set FUSE_WRITE_CACHE. + * TODO: expect FUSE_WRITE_CACHE after upgrading to protocol 7.9 */ - expect_write(ino, 0, len, len, FUSE_WRITE_CACHE, expected); + expect_write(ino, 0, len, len, 0, expected); expect_flush(ino, 1, ReturnErrno(0)); expect_release(ino, ReturnErrno(0));