Module Name: src
Committed By: perseant
Date: Fri Aug 2 00:24:53 UTC 2024
Modified Files:
src/tests/fs/exfatfs [perseant-exfatfs]: Makefile h_exfatfs_server.c
src/tests/fs/vfs [perseant-exfatfs]: Makefile
Added Files:
src/tests/fs/exfatfs [perseant-exfatfs]: t_newfs.sh
Log Message:
Add t_newfs to test compatibility of newfs, fsck and dumpfs utilities.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/tests/fs/exfatfs/Makefile \
src/tests/fs/exfatfs/h_exfatfs_server.c
cvs rdiff -u -r0 -r1.1.2.1 src/tests/fs/exfatfs/t_newfs.sh
cvs rdiff -u -r1.30 -r1.30.4.1 src/tests/fs/vfs/Makefile
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/exfatfs/Makefile
diff -u src/tests/fs/exfatfs/Makefile:1.1.2.1 src/tests/fs/exfatfs/Makefile:1.1.2.2
--- src/tests/fs/exfatfs/Makefile:1.1.2.1 Sat Jun 29 19:43:26 2024
+++ src/tests/fs/exfatfs/Makefile Fri Aug 2 00:24:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.1 2024/06/29 19:43:26 perseant Exp $
+# $NetBSD: Makefile,v 1.1.2.2 2024/08/02 00:24:52 perseant Exp $
#
.include <bsd.own.mk>
@@ -13,6 +13,8 @@ BINDIR.h_exfatfs_server= ${TESTSDIR}
TESTS_C+= t_mount
+TESTS_SH+= t_newfs
+
LDADD+=-lrumpfs_exfatfs # exfatfs
LDADD+=-lrumpdev_disk -lrumpdev # disk device
#VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
Index: src/tests/fs/exfatfs/h_exfatfs_server.c
diff -u src/tests/fs/exfatfs/h_exfatfs_server.c:1.1.2.1 src/tests/fs/exfatfs/h_exfatfs_server.c:1.1.2.2
--- src/tests/fs/exfatfs/h_exfatfs_server.c:1.1.2.1 Sat Jun 29 19:43:26 2024
+++ src/tests/fs/exfatfs/h_exfatfs_server.c Fri Aug 2 00:24:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: h_exfatfs_server.c,v 1.1.2.1 2024/06/29 19:43:26 perseant Exp $ */
+/* $NetBSD: h_exfatfs_server.c,v 1.1.2.2 2024/08/02 00:24:52 perseant Exp $ */
/*
* rump server for advanced quota tests
@@ -55,17 +55,13 @@ main(int argc, char **argv)
const char *filename;
const char *serverurl;
struct exfatfs_args uargs;
- int log = 0;
int ch;
- while ((ch = getopt(argc, argv, "bl")) != -1) {
+ while ((ch = getopt(argc, argv, "b")) != -1) {
switch(ch) {
case 'b':
background = 1;
break;
- case 'l':
- log = 1;
- break;
default:
usage();
}
@@ -93,7 +89,7 @@ main(int argc, char **argv)
die("mount point create", errno);
rump_pub_etfs_register("/diskdev", filename, RUMP_ETFS_BLK);
uargs.fspec = __UNCONST("/diskdev");
- if (rump_sys_mount(MOUNT_EXFATFS, FSTEST_MNTNAME, (log) ? MNT_LOG : 0,
+ if (rump_sys_mount(MOUNT_EXFATFS, FSTEST_MNTNAME, 0,
&uargs, sizeof(uargs)) == -1)
die("mount ffs", errno);
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.30 src/tests/fs/vfs/Makefile:1.30.4.1
--- src/tests/fs/vfs/Makefile:1.30 Mon Jun 6 10:56:29 2022
+++ src/tests/fs/vfs/Makefile Fri Aug 2 00:24:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2022/06/06 10:56:29 nia Exp $
+# $NetBSD: Makefile,v 1.30.4.1 2024/08/02 00:24:52 perseant Exp $
#
.include <bsd.own.mk>
@@ -28,6 +28,7 @@ SRCS.t_link+= sysctlbyname.c sysctlgetmi
LDADD+=-lrumpnet_shmif -lrumpnet -lrumpnet_net -lrumpnet_netinet# TCP/IP
LDADD+=-lrumpfs_nfs # NFS
+LDADD+=-lrumpfs_exfatfs # exFATfs
LDADD+=-lrumpfs_ext2fs # ext2fs
LDADD+=-lrumpfs_ffs # ffs
LDADD+=-lrumpfs_lfs # lfs
Added files:
Index: src/tests/fs/exfatfs/t_newfs.sh
diff -u /dev/null src/tests/fs/exfatfs/t_newfs.sh:1.1.2.1
--- /dev/null Fri Aug 2 00:24:53 2024
+++ src/tests/fs/exfatfs/t_newfs.sh Fri Aug 2 00:24:52 2024
@@ -0,0 +1,34 @@
+RDEV=`pwd`/bigfile.img
+dd if=/dev/zero of=$RDEV bs=1024 count=1024
+
+atf_test_case newfs_fsck_case
+newfs_fsck_case_head() {
+ atf_set "descr" "This test case endures that the filesystem produced by newfs_exfatfs is consistent with the expectations of fsck_exfatfs."
+}
+newfs_fsck_case_body() {
+ CSIZE=4096
+ while [ $CSIZE -le 65536 ]
+ do
+ atf_check -s eq:0 -e empty newfs_exfatfs -w -q -c $CSIZE $RDEV
+ atf_check -s eq:0 fsck_exfatfs -q -n $RDEV
+ CSIZE=$(( $CSIZE * 2 ))
+ done
+}
+
+atf_test_case newfs_dumpfs_case
+newfs_dumpfs_case_head() {
+ atf_set "descr" "This test case endures that the filesystem parameters passed to newfs_exfatfs are written into the file system and recognized by dumpexfatfs."
+}
+newfs_dumpfs_case_body() {
+ cat >expout <<EOF
+newfs_exfatfs -# 0x1 -a 8192 -c 8192 -h 16384 -S 512 -s 20480 $RDEV
+
+EOF
+ atf_check -s eq:0 -e empty newfs_exfatfs -Fwq -# 0x1 -a 8192 -c 8192 -h 16384 -S 512 -s 20480 $RDEV
+ atf_check -s eq:0 -e empty -o file:expout dumpexfatfs -n $RDEV
+}
+
+atf_init_test_cases() {
+ atf_add_test_case newfs_dumpfs_case
+ atf_add_test_case newfs_fsck_case
+}
