Module Name: src
Committed By: njoly
Date: Wed Jun 30 20:39:39 UTC 2010
Added Files:
src/tests/fs/common: ext2fs.c ffs.c h_fsmacros.h msdosfs.c sysvbfs.c
tmpfs.c
Log Message:
Add helper code and macros to ease writing filesystem tests with rump.
Support currently limited to ext2fs, ffs, msdos, sysvbfs and tmpfs.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/fs/common/ext2fs.c src/tests/fs/common/ffs.c \
src/tests/fs/common/h_fsmacros.h src/tests/fs/common/msdosfs.c \
src/tests/fs/common/sysvbfs.c src/tests/fs/common/tmpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tests/fs/common/ext2fs.c
diff -u /dev/null src/tests/fs/common/ext2fs.c:1.1
--- /dev/null Wed Jun 30 20:39:39 2010
+++ src/tests/fs/common/ext2fs.c Wed Jun 30 20:39:39 2010
@@ -0,0 +1,135 @@
+/* $NetBSD: ext2fs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by
+ *
+ * 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+struct ext2fstestargs {
+ struct ufs_args ta_uargs;
+ char ta_devpath[MAXPATHLEN];
+ char ta_imgpath[MAXPATHLEN];
+};
+
+static int
+ext2fs_newfs(void **buf, const char *image, off_t size)
+{
+ char cmd[1024];
+ int res;
+ static unsigned int num = 0;
+ struct ext2fstestargs *args;
+
+ size /= 512;
+ snprintf(cmd, 1024, "newfs_ext2fs -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.ext2fs", num);
+ snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+ args->ta_uargs.fspec = args->ta_devpath;
+
+ res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+ if (res != 0) {
+ free(args);
+ return res;
+ }
+
+ *buf = args;
+ num++;
+
+ return res;
+}
+
+static int
+ext2fs_delfs(void *buf)
+{
+ int res;
+ struct ext2fstestargs *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;
+}
+
+static int
+ext2fs_mount(void *buf, const char *path, int flags)
+{
+ int res;
+ struct ext2fstestargs *args = buf;
+
+ res = rump_sys_mkdir(path, 0777);
+ if (res == -1)
+ return res;
+
+ res = rump_sys_mount(MOUNT_EXT2FS, path, flags, &args->ta_uargs,
+ sizeof(args->ta_uargs));
+ return res;
+}
+
+static int
+ext2fs_unmount(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;
+}
Index: src/tests/fs/common/ffs.c
diff -u /dev/null src/tests/fs/common/ffs.c:1.1
--- /dev/null Wed Jun 30 20:39:39 2010
+++ src/tests/fs/common/ffs.c Wed Jun 30 20:39:39 2010
@@ -0,0 +1,134 @@
+/* $NetBSD: ffs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by
+ *
+ * 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+struct ffstestargs {
+ struct ufs_args ta_uargs;
+ char ta_devpath[MAXPATHLEN];
+ char ta_imgpath[MAXPATHLEN];
+};
+
+static int
+ffs_newfs(void **buf, const char *image, off_t size)
+{
+ char cmd[1024];
+ int res;
+ static unsigned int num = 0;
+ struct ffstestargs *args;
+
+ size /= 512;
+ snprintf(cmd, 1024, "newfs -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.ffs", num);
+ snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+ args->ta_uargs.fspec = args->ta_devpath;
+
+ res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+ if (res != 0) {
+ free(args);
+ return res;
+ }
+
+ *buf = args;
+ num++;
+
+ return 0;
+}
+
+static int
+ffs_delfs(void *buf)
+{
+ int res;
+ struct ffstestargs *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;
+}
+
+static int
+ffs_mount(void *buf, const char *path, int flags)
+{
+ int res;
+ struct ffstestargs *args = buf;
+
+ res = rump_sys_mkdir(path, 0777);
+ if (res == -1)
+ return res;
+
+ res = rump_sys_mount(MOUNT_FFS, path, flags, &args->ta_uargs,
+ sizeof(args->ta_uargs));
+ return res;
+}
+
+static int
+ffs_unmount(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;
+}
Index: src/tests/fs/common/h_fsmacros.h
diff -u /dev/null src/tests/fs/common/h_fsmacros.h:1.1
--- /dev/null Wed Jun 30 20:39:39 2010
+++ src/tests/fs/common/h_fsmacros.h Wed Jun 30 20:39:39 2010
@@ -0,0 +1,108 @@
+/* $NetBSD: h_fsmacros.h,v 1.1 2010/06/30 20:39:39 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by
+ *
+ * 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.
+ */
+
+#ifndef __H_FSMACROS_H_
+#define __H_FSMACROS_H_
+
+#include <atf-c.h>
+#include <string.h>
+
+#include "ext2fs.c"
+#include "ffs.c"
+#include "msdosfs.c"
+#include "sysvbfs.c"
+#include "tmpfs.c"
+
+#define IMGNAME "image.fs"
+#define IMGSIZE (10000 * 512)
+#define MNTNAME "/mnt"
+
+#define ATF_TC_FSADD(fs,type,func,desc) \
+ ATF_TC(fs##_##func); \
+ ATF_TC_HEAD(fs##_##func,tc) \
+ { \
+ atf_tc_set_md_var(tc, "descr", type " test for " desc); \
+ atf_tc_set_md_var(tc, "use.fs", "true"); \
+ } \
+ ATF_TC_BODY(fs##_##func,tc) \
+ { \
+ void *tmp; \
+ atf_check_fstype(tc, type); \
+ if (fs##_newfs(&tmp, IMGNAME, IMGSIZE) != 0) \
+ atf_tc_fail("newfs failed"); \
+ if (fs##_mount(tmp, MNTNAME, 0) != 0) \
+ atf_tc_fail("mount failed"); \
+ func(MNTNAME); \
+ if (fs##_unmount(MNTNAME, 0) != 0) \
+ atf_tc_fail("unmount failed"); \
+ if (fs##_delfs(tmp) != 0) \
+ atf_tc_fail("delfs failed"); \
+ }
+
+#define ATF_TP_FSADD(fs,func) \
+ ATF_TP_ADD_TC(tp,fs##_##func)
+
+#define ATF_TC_FSAPPLY(func,desc) \
+ ATF_TC_FSADD(ext2fs,"ext2fs",func,desc) \
+ ATF_TC_FSADD(ffs,"ffs",func,desc) \
+ ATF_TC_FSADD(msdosfs,"msdosfs",func,desc) \
+ ATF_TC_FSADD(sysvbfs,"sysvbfs",func,desc) \
+ ATF_TC_FSADD(tmpfs,"tmpfs",func,desc)
+
+#define ATF_TP_FSAPPLY(func) \
+ ATF_TP_FSADD(ext2fs,func); \
+ ATF_TP_FSADD(ffs,func); \
+ ATF_TP_FSADD(msdosfs,func); \
+ ATF_TP_FSADD(sysvbfs,func); \
+ ATF_TP_FSADD(tmpfs,func);
+
+#define ATF_FSAPPLY(func,desc) \
+ ATF_TC_FSAPPLY(func,desc); \
+ ATF_TP_ADD_TCS(tp) \
+ { \
+ ATF_TP_FSAPPLY(func); \
+ return atf_no_error(); \
+ }
+
+static void
+atf_check_fstype(const atf_tc_t *tc, const char *fs)
+{
+ const char *fstype;
+
+ if (!atf_tc_has_config_var(tc, "fstype"))
+ return;
+ fstype = atf_tc_get_config_var(tc, "fstype");
+ if (strcmp(fstype, fs) == 0)
+ return;
+ atf_tc_skip("filesystem not selected");
+}
+
+#endif /* __H_FSMACROS_H_ */
Index: src/tests/fs/common/msdosfs.c
diff -u /dev/null src/tests/fs/common/msdosfs.c:1.1
--- /dev/null Wed Jun 30 20:39:39 2010
+++ src/tests/fs/common/msdosfs.c Wed Jun 30 20:39:39 2010
@@ -0,0 +1,135 @@
+/* $NetBSD: msdosfs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by
+ *
+ * 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <msdosfs/msdosfsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+struct msdosfstestargs {
+ struct msdosfs_args ta_uargs;
+ char ta_devpath[MAXPATHLEN];
+ char ta_imgpath[MAXPATHLEN];
+};
+
+static int
+msdosfs_newfs(void **buf, const char *image, off_t size)
+{
+ char cmd[1024];
+ int res;
+ static unsigned int num = 0;
+ struct msdosfstestargs *args;
+
+ size /= 512; size -= (size % 63);
+ snprintf(cmd, 1024, "newfs_msdos -C %"PRId64"s %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.msdosfs", num);
+ snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+ args->ta_uargs.fspec = args->ta_devpath;
+
+ res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+ if (res != 0) {
+ free(args);
+ return res;
+ }
+
+ *buf = args;
+ num++;
+
+ return 0;
+}
+
+static int
+msdosfs_delfs(void *buf)
+{
+ int res;
+ struct msdosfstestargs *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;
+}
+
+static int
+msdosfs_mount(void *buf, const char *path, int flags)
+{
+ int res;
+ struct msdosfstestargs *args = buf;
+
+ res = rump_sys_mkdir(path, 0777);
+ if (res == -1)
+ return res;
+
+ res = rump_sys_mount(MOUNT_MSDOS, path, flags, &args->ta_uargs,
+ sizeof(args->ta_uargs));
+ return res;
+}
+
+static int
+msdosfs_unmount(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;
+}
Index: src/tests/fs/common/sysvbfs.c
diff -u /dev/null src/tests/fs/common/sysvbfs.c:1.1
--- /dev/null Wed Jun 30 20:39:39 2010
+++ src/tests/fs/common/sysvbfs.c Wed Jun 30 20:39:39 2010
@@ -0,0 +1,135 @@
+/* $NetBSD: sysvbfs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by
+ *
+ * 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+struct sysvbfstestargs {
+ struct ufs_args ta_uargs;
+ char ta_devpath[MAXPATHLEN];
+ char ta_imgpath[MAXPATHLEN];
+};
+
+static int
+sysvbfs_newfs(void **buf, const char *image, off_t size)
+{
+ char cmd[1024];
+ int res;
+ static unsigned int num = 0;
+ struct sysvbfstestargs *args;
+
+ size /= 512;
+ snprintf(cmd, 1024, "newfs_sysvbfs -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.sysvbfs", num);
+ snprintf(args->ta_imgpath, MAXPATHLEN, "%s", image);
+ args->ta_uargs.fspec = args->ta_devpath;
+
+ res = rump_pub_etfs_register(args->ta_devpath, image, RUMP_ETFS_BLK);
+ if (res != 0) {
+ free(args);
+ return res;
+ }
+
+ *buf = args;
+ num++;
+
+ return 0;
+}
+
+static int
+sysvbfs_delfs(void *buf)
+{
+ int res;
+ struct sysvbfstestargs *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;
+}
+
+static int
+sysvbfs_mount(void *buf, const char *path, int flags)
+{
+ int res;
+ struct sysvbfstestargs *args = buf;
+
+ res = rump_sys_mkdir(path, 0777);
+ if (res == -1)
+ return res;
+
+ res = rump_sys_mount(MOUNT_SYSVBFS, path, flags, &args->ta_uargs,
+ sizeof(args->ta_uargs));
+ return res;
+}
+
+static int
+sysvbfs_unmount(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;
+}
Index: src/tests/fs/common/tmpfs.c
diff -u /dev/null src/tests/fs/common/tmpfs.c:1.1
--- /dev/null Wed Jun 30 20:39:39 2010
+++ src/tests/fs/common/tmpfs.c Wed Jun 30 20:39:39 2010
@@ -0,0 +1,108 @@
+/* $NetBSD: tmpfs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */
+
+/*-
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by
+ *
+ * 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <fs/tmpfs/tmpfs_args.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+struct tmpfstestargs {
+ struct tmpfs_args ta_uargs;
+};
+
+static int
+tmpfs_newfs(void **buf, const char *image, off_t size)
+{
+ int res;
+ struct tmpfstestargs *args;
+
+ res = rump_init();
+ if (res != 0)
+ return res;
+
+ args = calloc(1, sizeof(*args));
+ if (args == NULL)
+ return -1;
+
+ args->ta_uargs.ta_version = TMPFS_ARGS_VERSION;
+ args->ta_uargs.ta_root_mode = 0777;
+ args->ta_uargs.ta_size_max = size;
+
+ *buf = args;
+
+ return 0;
+}
+
+static int
+tmpfs_delfs(void *buf)
+{
+ struct tmpfstestargs *args = buf;
+
+ free(args);
+
+ return 0;
+}
+
+static int
+tmpfs_mount(void *buf, const char *path, int flags)
+{
+ int res;
+ struct tmpfstestargs *args = buf;
+
+ res = rump_sys_mkdir(path, 0777);
+ if (res == -1)
+ return res;
+
+ res = rump_sys_mount(MOUNT_TMPFS, path, flags, &args->ta_uargs,
+ sizeof(args->ta_uargs));
+ return res;
+}
+
+static int
+tmpfs_unmount(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;
+}
