test

Signed-off-by: Umer Saleem <[email protected]>
truenas · Jan 8, 2025 · c4fc1ca · c4fc1ca
1 parent 98df705
commit c4fc1ca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/lib/libzfsacl/zfsacl/libzfsacl_impl_freebsd.c b/lib/libzfsacl/zfsacl/libzfsacl_impl_freebsd.c
@@ -441,7 +441,11 @@ boolean_t
 zfsace_set_permset(zfsacl_entry_t _entry, zfsace_permset_t _permset)
 {
 	acl_entry_t entry = BSDACE(_entry);
+#if __FreeBSD_version < 1500000
 	int permset = 0;
+#else
+	unsigned int permset = 0;
+#endif
 	int i, err;
 
 	for (i = 0; i < ARRAY_SIZE(bsdperm2nfs4perm); i++) {

diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run
@@ -28,14 +28,14 @@ failsafe = callbacks/zfs_failsafe
 outputdir = /var/tmp/test_results
 tags = ['functional']
 
-[tests/functional/acl/nfsv4]
-tests = ['nfsacl_001']
-tags = ['functional', 'acl', 'nfsv4']
-
 [tests/functional/acl/off]
 tests = ['dosmode', 'posixmode']
 tags = ['functional', 'acl']
 
+[tests/functional/acl/nfsv4]
+tests = ['nfsacl_001']
+tags = ['functional', 'acl', 'nfsv4']
+
 [tests/functional/alloc_class]
 tests = ['alloc_class_001_pos', 'alloc_class_002_neg', 'alloc_class_003_pos',
     'alloc_class_004_pos', 'alloc_class_005_pos', 'alloc_class_006_pos',

diff --git a/tests/runfiles/sanity.run b/tests/runfiles/sanity.run
@@ -30,14 +30,14 @@ failsafe = callbacks/zfs_failsafe
 outputdir = /var/tmp/test_results
 tags = ['functional']
 
-[tests/functional/acl/nfsv4]
-tests = ['nfsacl_001']
-tags = ['functional', 'acl', 'nfsv4']
-
 [tests/functional/acl/off]
 tests = ['posixmode']
 tags = ['functional', 'acl']
 
+[tests/functional/acl/nfsv4]
+tests = ['nfsacl_001']
+tags = ['functional', 'acl', 'nfsv4']
+
 [tests/functional/alloc_class]
 tests = ['alloc_class_003_pos', 'alloc_class_004_pos', 'alloc_class_005_pos',
     'alloc_class_006_pos', 'alloc_class_008_pos', 'alloc_class_010_pos',