diff options
author | Alan Somers <asomers@FreeBSD.org> | 2019-03-21 00:11:43 +0000 |
---|---|---|
committer | Alan Somers <asomers@FreeBSD.org> | 2019-03-21 00:11:43 +0000 |
commit | 9821f1d3231d4dea3e1319358f416425be2266a6 (patch) | |
tree | 778397a2fa5d593e93fbe2072b20c73fc7f581ce /tests/sys/fs | |
parent | f9856d08139ac5aea7c1258fc85958d6786b416f (diff) | |
download | src-9821f1d3231d4dea3e1319358f416425be2266a6.tar.gz src-9821f1d3231d4dea3e1319358f416425be2266a6.zip |
fusefs: adapt the tests to the fuse => fusefs rename
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/fuse2/; revision=345356
Diffstat (limited to 'tests/sys/fs')
-rw-r--r-- | tests/sys/fs/Makefile | 2 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/Makefile (renamed from tests/sys/fs/fuse/Makefile) | 2 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/access.cc (renamed from tests/sys/fs/fuse/access.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/create.cc (renamed from tests/sys/fs/fuse/create.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/default_permissions.cc (renamed from tests/sys/fs/fuse/default_permissions.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/destroy.cc (renamed from tests/sys/fs/fuse/destroy.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/flush.cc (renamed from tests/sys/fs/fuse/flush.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/fsync.cc (renamed from tests/sys/fs/fuse/fsync.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/fsyncdir.cc (renamed from tests/sys/fs/fuse/fsyncdir.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/getattr.cc (renamed from tests/sys/fs/fuse/getattr.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/interrupt.cc (renamed from tests/sys/fs/fuse/interrupt.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/link.cc (renamed from tests/sys/fs/fuse/link.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/locks.cc (renamed from tests/sys/fs/fuse/locks.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/lookup.cc (renamed from tests/sys/fs/fuse/lookup.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/mkdir.cc (renamed from tests/sys/fs/fuse/mkdir.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/mknod.cc (renamed from tests/sys/fs/fuse/mknod.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/mockfs.cc (renamed from tests/sys/fs/fuse/mockfs.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/mockfs.hh (renamed from tests/sys/fs/fuse/mockfs.hh) | 2 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/open.cc (renamed from tests/sys/fs/fuse/open.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/opendir.cc (renamed from tests/sys/fs/fuse/opendir.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/read.cc (renamed from tests/sys/fs/fuse/read.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/readdir.cc (renamed from tests/sys/fs/fuse/readdir.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/readlink.cc (renamed from tests/sys/fs/fuse/readlink.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/release.cc (renamed from tests/sys/fs/fuse/release.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/releasedir.cc (renamed from tests/sys/fs/fuse/releasedir.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/rename.cc (renamed from tests/sys/fs/fuse/rename.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/rmdir.cc (renamed from tests/sys/fs/fuse/rmdir.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/setattr.cc (renamed from tests/sys/fs/fuse/setattr.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/statfs.cc (renamed from tests/sys/fs/fuse/statfs.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/symlink.cc (renamed from tests/sys/fs/fuse/symlink.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/unlink.cc (renamed from tests/sys/fs/fuse/unlink.cc) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/utils.cc (renamed from tests/sys/fs/fuse/utils.cc) | 4 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/utils.hh (renamed from tests/sys/fs/fuse/utils.hh) | 0 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/write.cc (renamed from tests/sys/fs/fuse/write.cc) | 14 | ||||
-rw-r--r-- | tests/sys/fs/fusefs/xattr.cc (renamed from tests/sys/fs/fuse/xattr.cc) | 0 |
35 files changed, 12 insertions, 12 deletions
diff --git a/tests/sys/fs/Makefile b/tests/sys/fs/Makefile index ec7ebdfc449b..5b5e78068125 100644 --- a/tests/sys/fs/Makefile +++ b/tests/sys/fs/Makefile @@ -7,7 +7,7 @@ TESTSDIR= ${TESTSBASE}/sys/fs TESTSRC= ${SRCTOP}/contrib/netbsd-tests/fs #TESTS_SUBDIRS+= nullfs # XXX: needs rump -TESTS_SUBDIRS+= fuse +TESTS_SUBDIRS+= fusefs TESTS_SUBDIRS+= tmpfs ${PACKAGE}FILES+= h_funcs.subr diff --git a/tests/sys/fs/fuse/Makefile b/tests/sys/fs/fusefs/Makefile index c98020dc196d..d70e7a1a95a6 100644 --- a/tests/sys/fs/fuse/Makefile +++ b/tests/sys/fs/fusefs/Makefile @@ -2,7 +2,7 @@ PACKAGE= tests -TESTSDIR= ${TESTSBASE}/sys/fs/fuse +TESTSDIR= ${TESTSBASE}/sys/fs/fusefs # We could simply link all of these files into a single executable. But since # Kyua treats googletest programs as plain tests, it's better to separate them diff --git a/tests/sys/fs/fuse/access.cc b/tests/sys/fs/fusefs/access.cc index 094809be6462..094809be6462 100644 --- a/tests/sys/fs/fuse/access.cc +++ b/tests/sys/fs/fusefs/access.cc diff --git a/tests/sys/fs/fuse/create.cc b/tests/sys/fs/fusefs/create.cc index 088569cb2e4e..088569cb2e4e 100644 --- a/tests/sys/fs/fuse/create.cc +++ b/tests/sys/fs/fusefs/create.cc diff --git a/tests/sys/fs/fuse/default_permissions.cc b/tests/sys/fs/fusefs/default_permissions.cc index 9790f75601b0..9790f75601b0 100644 --- a/tests/sys/fs/fuse/default_permissions.cc +++ b/tests/sys/fs/fusefs/default_permissions.cc diff --git a/tests/sys/fs/fuse/destroy.cc b/tests/sys/fs/fusefs/destroy.cc index da3647ffff6d..da3647ffff6d 100644 --- a/tests/sys/fs/fuse/destroy.cc +++ b/tests/sys/fs/fusefs/destroy.cc diff --git a/tests/sys/fs/fuse/flush.cc b/tests/sys/fs/fusefs/flush.cc index d7fd02ad420d..d7fd02ad420d 100644 --- a/tests/sys/fs/fuse/flush.cc +++ b/tests/sys/fs/fusefs/flush.cc diff --git a/tests/sys/fs/fuse/fsync.cc b/tests/sys/fs/fusefs/fsync.cc index 9894a3d2888a..9894a3d2888a 100644 --- a/tests/sys/fs/fuse/fsync.cc +++ b/tests/sys/fs/fusefs/fsync.cc diff --git a/tests/sys/fs/fuse/fsyncdir.cc b/tests/sys/fs/fusefs/fsyncdir.cc index a36a53a304b2..a36a53a304b2 100644 --- a/tests/sys/fs/fuse/fsyncdir.cc +++ b/tests/sys/fs/fusefs/fsyncdir.cc diff --git a/tests/sys/fs/fuse/getattr.cc b/tests/sys/fs/fusefs/getattr.cc index 9e81b3b46ab1..9e81b3b46ab1 100644 --- a/tests/sys/fs/fuse/getattr.cc +++ b/tests/sys/fs/fusefs/getattr.cc diff --git a/tests/sys/fs/fuse/interrupt.cc b/tests/sys/fs/fusefs/interrupt.cc index 86135162587c..86135162587c 100644 --- a/tests/sys/fs/fuse/interrupt.cc +++ b/tests/sys/fs/fusefs/interrupt.cc diff --git a/tests/sys/fs/fuse/link.cc b/tests/sys/fs/fusefs/link.cc index 55a1785e342a..55a1785e342a 100644 --- a/tests/sys/fs/fuse/link.cc +++ b/tests/sys/fs/fusefs/link.cc diff --git a/tests/sys/fs/fuse/locks.cc b/tests/sys/fs/fusefs/locks.cc index a1d37357ffb1..a1d37357ffb1 100644 --- a/tests/sys/fs/fuse/locks.cc +++ b/tests/sys/fs/fusefs/locks.cc diff --git a/tests/sys/fs/fuse/lookup.cc b/tests/sys/fs/fusefs/lookup.cc index b4cc21a70ed6..b4cc21a70ed6 100644 --- a/tests/sys/fs/fuse/lookup.cc +++ b/tests/sys/fs/fusefs/lookup.cc diff --git a/tests/sys/fs/fuse/mkdir.cc b/tests/sys/fs/fusefs/mkdir.cc index c6b0b0945a39..c6b0b0945a39 100644 --- a/tests/sys/fs/fuse/mkdir.cc +++ b/tests/sys/fs/fusefs/mkdir.cc diff --git a/tests/sys/fs/fuse/mknod.cc b/tests/sys/fs/fusefs/mknod.cc index f77a91bfe3cc..f77a91bfe3cc 100644 --- a/tests/sys/fs/fuse/mknod.cc +++ b/tests/sys/fs/fusefs/mknod.cc diff --git a/tests/sys/fs/fuse/mockfs.cc b/tests/sys/fs/fusefs/mockfs.cc index 7812c6dd2250..7812c6dd2250 100644 --- a/tests/sys/fs/fuse/mockfs.cc +++ b/tests/sys/fs/fusefs/mockfs.cc diff --git a/tests/sys/fs/fuse/mockfs.hh b/tests/sys/fs/fusefs/mockfs.hh index 5061fd51524e..d9eb5888ae33 100644 --- a/tests/sys/fs/fuse/mockfs.hh +++ b/tests/sys/fs/fusefs/mockfs.hh @@ -171,7 +171,7 @@ ProcessMockerT ReturnImmediate( * "Mounts" a filesystem to a temporary directory and services requests * according to the programmed expectations. * - * Operates directly on the fuse(4) kernel API, not the libfuse(3) user api. + * Operates directly on the fusefs(4) kernel API, not the libfuse(3) user api. */ class MockFS { /* diff --git a/tests/sys/fs/fuse/open.cc b/tests/sys/fs/fusefs/open.cc index 220f2a79818d..220f2a79818d 100644 --- a/tests/sys/fs/fuse/open.cc +++ b/tests/sys/fs/fusefs/open.cc diff --git a/tests/sys/fs/fuse/opendir.cc b/tests/sys/fs/fusefs/opendir.cc index 94ceb69555eb..94ceb69555eb 100644 --- a/tests/sys/fs/fuse/opendir.cc +++ b/tests/sys/fs/fusefs/opendir.cc diff --git a/tests/sys/fs/fuse/read.cc b/tests/sys/fs/fusefs/read.cc index a1145c29a4ad..a1145c29a4ad 100644 --- a/tests/sys/fs/fuse/read.cc +++ b/tests/sys/fs/fusefs/read.cc diff --git a/tests/sys/fs/fuse/readdir.cc b/tests/sys/fs/fusefs/readdir.cc index 13387bf8d567..13387bf8d567 100644 --- a/tests/sys/fs/fuse/readdir.cc +++ b/tests/sys/fs/fusefs/readdir.cc diff --git a/tests/sys/fs/fuse/readlink.cc b/tests/sys/fs/fusefs/readlink.cc index de2828dd8774..de2828dd8774 100644 --- a/tests/sys/fs/fuse/readlink.cc +++ b/tests/sys/fs/fusefs/readlink.cc diff --git a/tests/sys/fs/fuse/release.cc b/tests/sys/fs/fusefs/release.cc index 88edb45a0806..88edb45a0806 100644 --- a/tests/sys/fs/fuse/release.cc +++ b/tests/sys/fs/fusefs/release.cc diff --git a/tests/sys/fs/fuse/releasedir.cc b/tests/sys/fs/fusefs/releasedir.cc index 0976cdd268d1..0976cdd268d1 100644 --- a/tests/sys/fs/fuse/releasedir.cc +++ b/tests/sys/fs/fusefs/releasedir.cc diff --git a/tests/sys/fs/fuse/rename.cc b/tests/sys/fs/fusefs/rename.cc index 81c039add5b4..81c039add5b4 100644 --- a/tests/sys/fs/fuse/rename.cc +++ b/tests/sys/fs/fusefs/rename.cc diff --git a/tests/sys/fs/fuse/rmdir.cc b/tests/sys/fs/fusefs/rmdir.cc index d85101e195d8..d85101e195d8 100644 --- a/tests/sys/fs/fuse/rmdir.cc +++ b/tests/sys/fs/fusefs/rmdir.cc diff --git a/tests/sys/fs/fuse/setattr.cc b/tests/sys/fs/fusefs/setattr.cc index d0be7ea85b41..d0be7ea85b41 100644 --- a/tests/sys/fs/fuse/setattr.cc +++ b/tests/sys/fs/fusefs/setattr.cc diff --git a/tests/sys/fs/fuse/statfs.cc b/tests/sys/fs/fusefs/statfs.cc index d3ec22bc2ade..d3ec22bc2ade 100644 --- a/tests/sys/fs/fuse/statfs.cc +++ b/tests/sys/fs/fusefs/statfs.cc diff --git a/tests/sys/fs/fuse/symlink.cc b/tests/sys/fs/fusefs/symlink.cc index d1bfa8d56e20..d1bfa8d56e20 100644 --- a/tests/sys/fs/fuse/symlink.cc +++ b/tests/sys/fs/fusefs/symlink.cc diff --git a/tests/sys/fs/fuse/unlink.cc b/tests/sys/fs/fusefs/unlink.cc index bdcdf4b8e151..bdcdf4b8e151 100644 --- a/tests/sys/fs/fuse/unlink.cc +++ b/tests/sys/fs/fusefs/unlink.cc diff --git a/tests/sys/fs/fuse/utils.cc b/tests/sys/fs/fusefs/utils.cc index b6776eafbf87..45756243d899 100644 --- a/tests/sys/fs/fuse/utils.cc +++ b/tests/sys/fs/fusefs/utils.cc @@ -40,10 +40,10 @@ using namespace testing; -/* Check that fuse(4) is accessible and the current user can mount(2) */ +/* Check that fusefs(4) is accessible and the current user can mount(2) */ void check_environment() { - const char *mod_name = "fuse"; + const char *mod_name = "fusefs"; const char *devnode = "/dev/fuse"; const char *usermount_node = "vfs.usermount"; int usermount_val = 0; diff --git a/tests/sys/fs/fuse/utils.hh b/tests/sys/fs/fusefs/utils.hh index 7791c4e0ef2c..7791c4e0ef2c 100644 --- a/tests/sys/fs/fuse/utils.hh +++ b/tests/sys/fs/fusefs/utils.hh diff --git a/tests/sys/fs/fuse/write.cc b/tests/sys/fs/fusefs/write.cc index de20b03b8f6f..4a670b74f9c7 100644 --- a/tests/sys/fs/fuse/write.cc +++ b/tests/sys/fs/fusefs/write.cc @@ -66,7 +66,7 @@ void expect_release(uint64_t ino, ProcessMockerT r) } void require_sync_resize_0() { - const char *sync_resize_node = "vfs.fuse.sync_resize"; + const char *sync_resize_node = "vfs.fusefs.sync_resize"; int val = 0; size_t size = sizeof(val); @@ -74,7 +74,7 @@ void require_sync_resize_0() { << strerror(errno); if (val != 0) GTEST_SKIP() << - "vfs.fuse.sync_resize must be set to 0 for this test." + "vfs.fusefs.sync_resize must be set to 0 for this test." " That sysctl will probably be removed soon."; } @@ -100,7 +100,7 @@ virtual void SetUp() { class WriteThrough: public Write { virtual void SetUp() { - const char *cache_mode_node = "vfs.fuse.data_cache_mode"; + const char *cache_mode_node = "vfs.fusefs.data_cache_mode"; int val = 0; size_t size = sizeof(val); @@ -111,7 +111,7 @@ virtual void SetUp() { ASSERT_EQ(0, sysctlbyname(cache_mode_node, &val, &size, NULL, 0)) << strerror(errno); if (val != 1) - GTEST_SKIP() << "vfs.fuse.data_cache_mode must be set to 1 " + GTEST_SKIP() << "vfs.fusefs.data_cache_mode must be set to 1 " "(writethrough) for this test"; } @@ -121,7 +121,7 @@ virtual void SetUp() { class WriteBack: public Write { virtual void SetUp() { - const char *node = "vfs.fuse.data_cache_mode"; + const char *node = "vfs.fusefs.data_cache_mode"; int val = 0; size_t size = sizeof(val); @@ -132,7 +132,7 @@ virtual void SetUp() { ASSERT_EQ(0, sysctlbyname(node, &val, &size, NULL, 0)) << strerror(errno); if (val != 2) - GTEST_SKIP() << "vfs.fuse.data_cache_mode must be set to 2 " + GTEST_SKIP() << "vfs.fusefs.data_cache_mode must be set to 2 " "(writeback) for this test"; } @@ -343,7 +343,7 @@ TEST_F(Write, DISABLED_direct_io_short_write_iov) * write, then it must set the FUSE_WRITE_CACHE bit */ /* https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236378 */ -// TODO: check vfs.fuse.mmap_enable +// TODO: check vfs.fusefs.mmap_enable TEST_F(Write, DISABLED_mmap) { const char FULLPATH[] = "mountpoint/some_file.txt"; diff --git a/tests/sys/fs/fuse/xattr.cc b/tests/sys/fs/fusefs/xattr.cc index 6cd5263d7ec0..6cd5263d7ec0 100644 --- a/tests/sys/fs/fuse/xattr.cc +++ b/tests/sys/fs/fusefs/xattr.cc |