Module Name: src
Committed By: uch
Date: Thu Aug 11 10:52:12 UTC 2011
Modified Files:
src/tests/fs/common: Makefile h_fsmacros.h
src/tests/fs/vfs: Makefile t_vnops.c
Added Files:
src/tests/fs/common: fstest_v7fs.c
Log Message:
add ATF tests for v7fs. patch by njoly@. thank you.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/common/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/common/fstest_v7fs.c
cvs rdiff -u -r1.34 -r1.35 src/tests/fs/common/h_fsmacros.h
cvs rdiff -u -r1.15 -r1.16 src/tests/fs/vfs/Makefile
cvs rdiff -u -r1.26 -r1.27 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.6 src/tests/fs/common/Makefile:1.7
--- src/tests/fs/common/Makefile:1.6 Thu Nov 11 17:39:29 2010
+++ src/tests/fs/common/Makefile Thu Aug 11 10:52:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/11 17:39:29 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/11 10:52:12 uch Exp $
#
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
LIB= vfstest
SRCS= fstest_ext2fs.c fstest_ffs.c fstest_lfs.c fstest_msdosfs.c \
fstest_nfs.c fstest_puffs.c fstest_rumpfs.c fstest_sysvbfs.c \
- fstest_tmpfs.c
+ fstest_tmpfs.c fstest_v7fs.c
WARNS= 3
Index: src/tests/fs/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.34 src/tests/fs/common/h_fsmacros.h:1.35
--- src/tests/fs/common/h_fsmacros.h:1.34 Tue Mar 22 16:50:16 2011
+++ src/tests/fs/common/h_fsmacros.h Thu Aug 11 10:52:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: h_fsmacros.h,v 1.34 2011/03/22 16:50:16 jmmv Exp $ */
+/* $NetBSD: h_fsmacros.h,v 1.35 2011/08/11 10:52:12 uch Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -61,6 +61,7 @@
FSPROTOS(rumpfs);
FSPROTOS(sysvbfs);
FSPROTOS(tmpfs);
+FSPROTOS(v7fs);
#ifndef FSTEST_IMGNAME
#define FSTEST_IMGNAME "image.fs"
@@ -164,7 +165,8 @@
ATF_TC_FSADD(p2k_ffs,MOUNT_PUFFS,func,desc) \
ATF_TC_FSADD(rumpfs,MOUNT_RUMPFS,func,desc) \
ATF_TC_FSADD(sysvbfs,MOUNT_SYSVBFS,func,desc) \
- ATF_TC_FSADD(tmpfs,MOUNT_TMPFS,func,desc)
+ ATF_TC_FSADD(tmpfs,MOUNT_TMPFS,func,desc) \
+ ATF_TC_FSADD(v7fs,MOUNT_V7FS,func,desc)
#define ATF_TP_FSAPPLY(func) \
ATF_TP_FSADD(ext2fs,func); \
@@ -177,7 +179,8 @@
ATF_TP_FSADD(p2k_ffs,func); \
ATF_TP_FSADD(rumpfs,func); \
ATF_TP_FSADD(sysvbfs,func); \
- ATF_TP_FSADD(tmpfs,func);
+ ATF_TP_FSADD(tmpfs,func); \
+ ATF_TP_FSADD(v7fs,func);
/*
* Same as above, but generate a file system image first and perform
@@ -197,7 +200,8 @@
ATF_TC_FSADD_RO(msdosfs,MOUNT_MSDOS,func,desc,gen) \
ATF_TC_FSADD_RO(nfs,MOUNT_NFS,func,desc,gen) \
ATF_TC_FSADD_RO(nfsro,MOUNT_NFS,func,desc,gen) \
- ATF_TC_FSADD_RO(sysvbfs,MOUNT_SYSVBFS,func,desc,gen)
+ ATF_TC_FSADD_RO(sysvbfs,MOUNT_SYSVBFS,func,desc,gen) \
+ ATF_TC_FSADD_RO(v7fs,MOUNT_V7FS,func,desc,gen)
#define ATF_TP_FSAPPLY_RO(func) \
ATF_TP_FSADD(ext2fs,func); \
@@ -206,7 +210,8 @@
ATF_TP_FSADD(msdosfs,func); \
ATF_TP_FSADD(nfs,func); \
ATF_TP_FSADD(nfsro,func); \
- ATF_TP_FSADD(sysvbfs,func);
+ ATF_TP_FSADD(sysvbfs,func); \
+ ATF_TP_FSADD(v7fs,func);
#define ATF_FSAPPLY(func,desc) \
ATF_TC_FSAPPLY(func,desc); \
@@ -254,6 +259,8 @@
(strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "sysvbfs") == 0)
#define FSTYPE_TMPFS(tc)\
(strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "tmpfs") == 0)
+#define FSTYPE_V7FS(tc)\
+ (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "v7fs") == 0)
#define FSTEST_ENTER() \
if (rump_sys_chdir(FSTEST_MNTNAME) == -1) \
Index: src/tests/fs/vfs/Makefile
diff -u src/tests/fs/vfs/Makefile:1.15 src/tests/fs/vfs/Makefile:1.16
--- src/tests/fs/vfs/Makefile:1.15 Wed Jan 12 21:13:27 2011
+++ src/tests/fs/vfs/Makefile Thu Aug 11 10:52:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/01/12 21:13:27 pooka Exp $
+# $NetBSD: Makefile,v 1.16 2011/08/11 10:52:12 uch Exp $
#
.include <bsd.own.mk>
@@ -25,6 +25,7 @@
LDADD+=-lrumpfs_sysvbfs # sysvbfs
LDADD+=-lrumpfs_tmpfs # tmpfs
LDADD+=-lrumpfs_union # union
+LDADD+=-lrumpfs_v7fs # v7fs
LDADD+=-lrumpdev_disk -lrumpdev # disk device
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.26 src/tests/fs/vfs/t_vnops.c:1.27
--- src/tests/fs/vfs/t_vnops.c:1.26 Sat Jul 23 09:59:14 2011
+++ src/tests/fs/vfs/t_vnops.c Thu Aug 11 10:52:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.26 2011/07/23 09:59:14 alnsn Exp $ */
+/* $NetBSD: t_vnops.c,v 1.27 2011/08/11 10:52:12 uch Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -575,7 +575,8 @@
CHECK(st_atimespec.tv_sec);
}
CHECK(st_mtimespec.tv_sec);
- if (!(FSTYPE_EXT2FS(tc) || FSTYPE_MSDOS(tc) || FSTYPE_SYSVBFS(tc))) {
+ if (!(FSTYPE_EXT2FS(tc) || FSTYPE_MSDOS(tc) ||
+ FSTYPE_SYSVBFS(tc) || FSTYPE_V7FS(tc))) {
CHECK(st_atimespec.tv_nsec);
CHECK(st_mtimespec.tv_nsec);
}
Added files:
Index: src/tests/fs/common/fstest_v7fs.c
diff -u /dev/null src/tests/fs/common/fstest_v7fs.c:1.1
--- /dev/null Thu Aug 11 10:52:13 2011
+++ src/tests/fs/common/fstest_v7fs.c Thu Aug 11 10:52:12 2011
@@ -0,0 +1,140 @@
+/* $NetBSD: fstest_v7fs.c,v 1.1 2011/08/11 10:52:12 uch Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nicolas Joly.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <fs/v7fs/v7fs_args.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+struct v7fstestargs {
+ struct v7fs_args ta_uargs;
+ char ta_devpath[MAXPATHLEN];
+ char ta_imgpath[MAXPATHLEN];
+};
+
+int
+v7fs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+ off_t size, void *fspriv)
+{
+ char cmd[1024];
+ int res;
+ static unsigned int num = 0;
+ struct v7fstestargs *args;
+
+ size /= 512;
+ snprintf(cmd, 1024, "newfs_v7fs -F -s %"PRId64" %s >/dev/null",
+ size, image);
+ res = system(cmd);
+ if (res != 0)
+ return res;
+
+ res = rump_init();
+ if (res != 0)
+ return res;
+
+ args = calloc(1, sizeof(*args));
+ if (args == NULL)
+ return -1;
+
+ snprintf(args->ta_devpath, MAXPATHLEN, "/dev/device%d.v7fs", num);
+ snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+ args->ta_uargs.fspec = args->ta_devpath;
+ args->ta_uargs.endian = _BYTE_ORDER;
+
+ res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+ if (res != 0) {
+ free(args);
+ return res;
+ }
+
+ *buf = args;
+ num++;
+
+ return 0;
+}
+
+int
+v7fs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+ int res;
+ struct v7fstestargs *args = buf;
+
+ res = rump_pub_etfs_remove(args->ta_devpath);
+ if (res != 0)
+ return res;
+
+ res = unlink(args->ta_imgpath);
+ if (res != 0)
+ return res;
+
+ free(args);
+
+ return 0;
+}
+
+int
+v7fs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+ int res;
+ struct v7fstestargs *args = buf;
+
+ res = rump_sys_mkdir(path, 0777);
+ if (res == -1)
+ return res;
+
+ res = rump_sys_mount(MOUNT_V7FS, path, flags, &args->ta_uargs,
+ sizeof(args->ta_uargs));
+ return res;
+}
+
+int
+v7fs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+ int res;
+
+ res = rump_sys_unmount(path, flags);
+ if (res == -1)
+ return res;
+
+ res = rump_sys_rmdir(path);
+ return res;
+}
