[src/trunk]: src/tests/fs/common Add helper code and macros to ease writing f...

[njoly <njoly%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee4c05031272
branches:  trunk
changeset: 755969:ee4c05031272
user:      njoly <njoly%NetBSD.org@localhost>
date:      Wed Jun 30 20:39:39 2010 +0000

description:
Add helper code and macros to ease writing filesystem tests with rump.
Support currently limited to ext2fs, ffs, msdos, sysvbfs and tmpfs.

diffstat:

 tests/fs/common/ext2fs.c     |  135 +++++++++++++++++++++++++++++++++++++++++++
 tests/fs/common/ffs.c        |  134 ++++++++++++++++++++++++++++++++++++++++++
 tests/fs/common/h_fsmacros.h |  108 ++++++++++++++++++++++++++++++++++
 tests/fs/common/msdosfs.c    |  135 +++++++++++++++++++++++++++++++++++++++++++
 tests/fs/common/sysvbfs.c    |  135 +++++++++++++++++++++++++++++++++++++++++++
 tests/fs/common/tmpfs.c      |  108 ++++++++++++++++++++++++++++++++++
 6 files changed, 755 insertions(+), 0 deletions(-)

diffs (truncated from 779 to 300 lines):

diff -r d6e474364e44 -r ee4c05031272 tests/fs/common/ext2fs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/fs/common/ext2fs.c  Wed Jun 30 20:39:39 2010 +0000
@@ -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;
+}
diff -r d6e474364e44 -r ee4c05031272 tests/fs/common/ffs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/fs/common/ffs.c     Wed Jun 30 20:39:39 2010 +0000
@@ -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;
+}
diff -r d6e474364e44 -r ee4c05031272 tests/fs/common/h_fsmacros.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/fs/common/h_fsmacros.h      Wed Jun 30 20:39:39 2010 +0000
@@ -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