Module Name: src
Committed By: pooka
Date: Thu Nov 11 17:39:29 UTC 2010
Modified Files:
src/tests/fs/common: Makefile h_fsmacros.h
Added Files:
src/tests/fs/common: fstest_rumpfs.c
Log Message:
Add rumpfs to list of file systems to be autotested.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/common/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/common/fstest_rumpfs.c
cvs rdiff -u -r1.21 -r1.22 src/tests/fs/common/h_fsmacros.h
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.5 src/tests/fs/common/Makefile:1.6
--- src/tests/fs/common/Makefile:1.5 Tue Aug 3 17:24:45 2010
+++ src/tests/fs/common/Makefile Thu Nov 11 17:39:29 2010
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2010/08/03 17:24:45 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/11 17:39:29 pooka Exp $
#
.include <bsd.own.mk>
LIB= vfstest
SRCS= fstest_ext2fs.c fstest_ffs.c fstest_lfs.c fstest_msdosfs.c \
- fstest_nfs.c fstest_puffs.c fstest_sysvbfs.c fstest_tmpfs.c
+ fstest_nfs.c fstest_puffs.c fstest_rumpfs.c fstest_sysvbfs.c \
+ fstest_tmpfs.c
WARNS= 3
Index: src/tests/fs/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.21 src/tests/fs/common/h_fsmacros.h:1.22
--- src/tests/fs/common/h_fsmacros.h:1.21 Sun Nov 7 17:51:17 2010
+++ src/tests/fs/common/h_fsmacros.h Thu Nov 11 17:39:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: h_fsmacros.h,v 1.21 2010/11/07 17:51:17 jmmv Exp $ */
+/* $NetBSD: h_fsmacros.h,v 1.22 2010/11/11 17:39:29 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -55,6 +55,7 @@
FSPROTOS(msdosfs);
FSPROTOS(nfs);
FSPROTOS(puffs);
+FSPROTOS(rumpfs);
FSPROTOS(sysvbfs);
FSPROTOS(tmpfs);
@@ -133,6 +134,7 @@
ATF_TC_FSADD(msdosfs,MOUNT_MSDOS,func,desc) \
ATF_TC_FSADD(nfs,MOUNT_NFS,func,desc) \
ATF_TC_FSADD(puffs,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)
@@ -143,6 +145,7 @@
ATF_TP_FSADD(msdosfs,func); \
ATF_TP_FSADD(nfs,func); \
ATF_TP_FSADD(puffs,func); \
+ ATF_TP_FSADD(rumpfs,func); \
ATF_TP_FSADD(sysvbfs,func); \
ATF_TP_FSADD(tmpfs,func);
@@ -179,6 +182,8 @@
(strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_NFS) == 0)
#define FSTYPE_PUFFS(tc)\
(strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_PUFFS) == 0)
+#define FSTYPE_RUMPFS(tc)\
+ (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_RUMPFS) == 0)
#define FSTYPE_SYSVBFS(tc)\
(strcmp(atf_tc_get_md_var(tc, "X-fs.type"), MOUNT_SYSVBFS) == 0)
#define FSTYPE_TMPFS(tc)\
Added files:
Index: src/tests/fs/common/fstest_rumpfs.c
diff -u /dev/null src/tests/fs/common/fstest_rumpfs.c:1.1
--- /dev/null Thu Nov 11 17:39:29 2010
+++ src/tests/fs/common/fstest_rumpfs.c Thu Nov 11 17:39:29 2010
@@ -0,0 +1,83 @@
+/* $NetBSD: fstest_rumpfs.c,v 1.1 2010/11/11 17:39:29 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2010 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 <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+int
+rumpfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+ off_t size, void *fspriv)
+{
+
+ return rump_init();
+}
+
+int
+rumpfs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+
+ return 0;
+}
+
+int
+rumpfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+ int res;
+
+ res = rump_sys_mkdir(path, 0777);
+ if (res == -1)
+ return res;
+
+ return rump_sys_mount(MOUNT_RUMPFS, path, flags, NULL, 0);
+}
+
+int
+rumpfs_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;
+
+ return rump_sys_rmdir(path);
+}
