Module Name: src
Committed By: perseant
Date: Mon Aug 12 22:38:30 UTC 2024
Modified Files:
src/tests/fs/common [perseant-exfatfs]: Makefile
src/tests/fs/vfs [perseant-exfatfs]: Makefile t_link.c t_ro.c
t_unpriv.c t_vnops.c
Log Message:
Add exFAT conditions to vfs tests
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/tests/fs/common/Makefile
cvs rdiff -u -r1.30.4.1 -r1.30.4.2 src/tests/fs/vfs/Makefile
cvs rdiff -u -r1.5 -r1.5.4.1 src/tests/fs/vfs/t_link.c
cvs rdiff -u -r1.8 -r1.8.10.1 src/tests/fs/vfs/t_ro.c
cvs rdiff -u -r1.16 -r1.16.12.1 src/tests/fs/vfs/t_unpriv.c
cvs rdiff -u -r1.63 -r1.63.2.1 src/tests/fs/vfs/t_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/common/Makefile
diff -u src/tests/fs/common/Makefile:1.17 src/tests/fs/common/Makefile:1.17.2.1
--- src/tests/fs/common/Makefile:1.17 Sat Jun 3 09:09:15 2023
+++ src/tests/fs/common/Makefile Mon Aug 12 22:38:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/06/03 09:09:15 lukem Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2024/08/12 22:38:30 perseant Exp $
#
.include <bsd.own.mk>
@@ -12,6 +12,10 @@ SRCS= fstest_ext2fs.c fstest_ffs.c fstes
SRCS+= fstest_zfs.c
CPPFLAGS+=-DWANT_ZFS_TESTS
.endif
+.if (${MKEXFATFS} != "no")
+SRCS+= fstest_exfatfs.c
+CPPFLAGS+=-DWANT_EXFATFS_TESTS
+.endif
WARNS= 3
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.30.4.1 src/tests/fs/vfs/Makefile:1.30.4.2
--- src/tests/fs/vfs/Makefile:1.30.4.1 Fri Aug 2 00:24:52 2024
+++ src/tests/fs/vfs/Makefile Mon Aug 12 22:38:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30.4.1 2024/08/02 00:24:52 perseant Exp $
+# $NetBSD: Makefile,v 1.30.4.2 2024/08/12 22:38:30 perseant Exp $
#
.include <bsd.own.mk>
@@ -52,6 +52,10 @@ LDADD+=-lrumpnet # static linking
LDADD+=-lutil
+.if (${MKEXFATFS} != "no")
+LDADD+=-lrumpfs_exfatfs
+CPPFLAGS+=-DWANT_EXFATFS_TESTS
+.endif
.if (${MKZFS} != "no")
LDADD+=-lrumpfs_zfs -lrumpkern_solaris -lrumpdev_rnd -lrumpkern_sysproxy
CPPFLAGS+=-DWANT_ZFS_TESTS
Index: src/tests/fs/vfs/t_link.c
diff -u src/tests/fs/vfs/t_link.c:1.5 src/tests/fs/vfs/t_link.c:1.5.4.1
--- src/tests/fs/vfs/t_link.c:1.5 Wed Mar 30 16:35:28 2022
+++ src/tests/fs/vfs/t_link.c Mon Aug 12 22:38:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_link.c,v 1.5 2022/03/30 16:35:28 christos Exp $ */
+/* $NetBSD: t_link.c,v 1.5.4.1 2024/08/12 22:38:30 perseant Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
#include "h_macros.h"
#define USES_OWNER \
- if (FSTYPE_MSDOS(tc)) \
+ if (FSTYPE_MSDOS(tc) || FSTYPE_EXFATFS(tc)) \
atf_tc_skip("owner not supported by file system")
#define USES_USERLEVEL \
if (FSTYPE_PUFFS(tc) || FSTYPE_P2K_FFS(tc)) \
Index: src/tests/fs/vfs/t_ro.c
diff -u src/tests/fs/vfs/t_ro.c:1.8 src/tests/fs/vfs/t_ro.c:1.8.10.1
--- src/tests/fs/vfs/t_ro.c:1.8 Sat Sep 21 14:25:42 2019
+++ src/tests/fs/vfs/t_ro.c Mon Aug 12 22:38:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ro.c,v 1.8 2019/09/21 14:25:42 kre Exp $ */
+/* $NetBSD: t_ro.c,v 1.8.10.1 2024/08/12 22:38:30 perseant Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -129,13 +129,13 @@ attrs(const atf_tc_t *tc, const char *mp
RL(rump_sys_stat(AFILE, &sb));
ATF_REQUIRE_ERRNO(EROFS, rump_sys_chmod(AFILE, 0775) == -1);
- if (!FSTYPE_MSDOS(tc))
+ if (!(FSTYPE_MSDOS(tc) || FSTYPE_EXFATFS(tc)))
ATF_REQUIRE_ERRNO(EROFS, rump_sys_chown(AFILE, 1, 1) == -1);
ATF_REQUIRE_ERRNO(EROFS, rump_sys_utimes(AFILE, sometvs) == -1);
RL(fd = rump_sys_open(AFILE, O_RDONLY));
ATF_REQUIRE_ERRNO(EROFS, rump_sys_fchmod(fd, 0775) == -1);
- if (!FSTYPE_MSDOS(tc))
+ if (!(FSTYPE_MSDOS(tc)|| FSTYPE_EXFATFS(tc)))
ATF_REQUIRE_ERRNO(EROFS, rump_sys_fchown(fd, 1, 1) == -1);
ATF_REQUIRE_ERRNO(EROFS, rump_sys_futimes(fd, sometvs) == -1);
RL(rump_sys_close(fd));
Index: src/tests/fs/vfs/t_unpriv.c
diff -u src/tests/fs/vfs/t_unpriv.c:1.16 src/tests/fs/vfs/t_unpriv.c:1.16.12.1
--- src/tests/fs/vfs/t_unpriv.c:1.16 Wed Nov 28 10:01:28 2018
+++ src/tests/fs/vfs/t_unpriv.c Mon Aug 12 22:38:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_unpriv.c,v 1.16 2018/11/28 10:01:28 hannken Exp $ */
+/* $NetBSD: t_unpriv.c,v 1.16.12.1 2024/08/12 22:38:30 perseant Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include "h_macros.h"
#define USES_OWNER \
- if (FSTYPE_MSDOS(tc)) \
+ if (FSTYPE_MSDOS(tc) || FSTYPE_EXFATFS(tc)) \
atf_tc_skip("owner not supported by file system")
static void
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.63 src/tests/fs/vfs/t_vnops.c:1.63.2.1
--- src/tests/fs/vfs/t_vnops.c:1.63 Mon May 8 19:23:45 2023
+++ src/tests/fs/vfs/t_vnops.c Mon Aug 12 22:38:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.63 2023/05/08 19:23:45 andvar Exp $ */
+/* $NetBSD: t_vnops.c,v 1.63.2.1 2024/08/12 22:38:30 perseant Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -428,7 +428,7 @@ rename_reg_nodir(const atf_tc_t *tc, con
if (rump_sys_chdir(mp) == -1)
atf_tc_fail_errno("chdir mountpoint");
- if (FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))
+ if (FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc) || FSTYPE_EXFATFS(tc))
haslinks = false;
else
haslinks = true;
@@ -746,7 +746,7 @@ attrs(const atf_tc_t *tc, const char *mp
RL(fd = rump_sys_open(TESTFILE, O_RDWR | O_CREAT, 0755));
RL(rump_sys_close(fd));
RL(rump_sys_stat(TESTFILE, &sb));
- if (!(FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))) {
+ if (!(FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc) || FSTYPE_EXFATFS(tc))) {
RL(rump_sys_chown(TESTFILE, 1, 2));
sb.st_uid = 1;
sb.st_gid = 2;
@@ -767,18 +767,19 @@ attrs(const atf_tc_t *tc, const char *mp
RL(rump_sys_stat(TESTFILE, &sb2));
#define CHECK(a) ATF_REQUIRE_EQ(sb.a, sb2.a)
- if (!(FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))) {
+ if (!(FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc) || FSTYPE_EXFATFS(tc))) {
CHECK(st_uid);
CHECK(st_gid);
CHECK(st_mode);
}
- if (!FSTYPE_MSDOS(tc)) {
+ if (!(FSTYPE_MSDOS(tc) || FSTYPE_EXFATFS(tc))) {
/* msdosfs has only access date, not time */
CHECK(st_atimespec.tv_sec);
}
CHECK(st_mtimespec.tv_sec);
if (!(FSTYPE_EXT2FS(tc) || FSTYPE_MSDOS(tc) ||
- FSTYPE_SYSVBFS(tc) || FSTYPE_V7FS(tc))) {
+ FSTYPE_SYSVBFS(tc) || FSTYPE_V7FS(tc) ||
+ FSTYPE_EXFATFS(tc))) {
CHECK(st_atimespec.tv_nsec);
CHECK(st_mtimespec.tv_nsec);
}
@@ -1003,7 +1004,7 @@ access_simple(const atf_tc_t *tc, const
RL(rump_sys_close(fd));
#define ALLACC (F_OK | X_OK | W_OK | R_OK)
- if (FSTYPE_SYSVBFS(tc) || FSTYPE_MSDOS(tc))
+ if (FSTYPE_SYSVBFS(tc) || FSTYPE_MSDOS(tc) || FSTYPE_EXFATFS(tc))
tmode = F_OK;
else
tmode = ALLACC;
