Module Name: src
Committed By: reinoud
Date: Wed Jun 26 19:29:24 UTC 2013
Modified Files:
src/tests/fs/common: Makefile h_fsmacros.h
Added Files:
src/tests/fs/common: fstest_udf.c
Log Message:
Add UDF as one of the filesytems to test. Might help understand why rump is
misbehaving on it.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/fs/common/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/common/fstest_udf.c
cvs rdiff -u -r1.37 -r1.38 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.10 src/tests/fs/common/Makefile:1.11
--- src/tests/fs/common/Makefile:1.10 Tue Mar 5 19:58:33 2013
+++ src/tests/fs/common/Makefile Wed Jun 26 19:29:24 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/03/05 19:58:33 christos Exp $
+# $NetBSD: Makefile,v 1.11 2013/06/26 19:29:24 reinoud 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_v7fs.c
+ fstest_tmpfs.c fstest_udf.c fstest_v7fs.c
.if (${MKZFS} != "no")
SRCS+= fstest_zfs.c
Index: src/tests/fs/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.37 src/tests/fs/common/h_fsmacros.h:1.38
--- src/tests/fs/common/h_fsmacros.h:1.37 Sat Mar 16 05:24:59 2013
+++ src/tests/fs/common/h_fsmacros.h Wed Jun 26 19:29:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: h_fsmacros.h,v 1.37 2013/03/16 05:24:59 jmmv Exp $ */
+/* $NetBSD: h_fsmacros.h,v 1.38 2013/06/26 19:29:24 reinoud Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -61,6 +61,7 @@ FSPROTOS(puffs);
FSPROTOS(rumpfs);
FSPROTOS(sysvbfs);
FSPROTOS(tmpfs);
+FSPROTOS(udf);
FSPROTOS(v7fs);
FSPROTOS(zfs);
@@ -175,6 +176,7 @@ do { \
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(udf,MOUNT_UDF,func,desc) \
ATF_TC_FSADD(v7fs,MOUNT_V7FS,func,desc)
#define ATF_TP_FSAPPLY_NOZFS(func) \
@@ -189,6 +191,7 @@ do { \
ATF_TP_FSADD(rumpfs,func); \
ATF_TP_FSADD(sysvbfs,func); \
ATF_TP_FSADD(tmpfs,func); \
+ ATF_TP_FSADD(udf,func); \
ATF_TP_FSADD(v7fs,func);
/* XXX: this will not scale */
@@ -228,6 +231,7 @@ do { \
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(udf,MOUNT_UDF,func,desc,gen) \
ATF_TC_FSADD_RO(v7fs,MOUNT_V7FS,func,desc,gen)
#define ATF_TP_FSAPPLY_RO(func) \
@@ -238,6 +242,7 @@ do { \
ATF_TP_FSADD(nfs,func); \
ATF_TP_FSADD(nfsro,func); \
ATF_TP_FSADD(sysvbfs,func); \
+ ATF_TP_FSADD(udf,func); \
ATF_TP_FSADD(v7fs,func);
#define ATF_FSAPPLY(func,desc) \
@@ -286,6 +291,8 @@ atf_check_fstype(const atf_tc_t *tc, con
(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_UDF(tc)\
+ (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "udf") == 0)
#define FSTYPE_V7FS(tc)\
(strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "v7fs") == 0)
#define FSTYPE_ZFS(tc)\
Added files:
Index: src/tests/fs/common/fstest_udf.c
diff -u /dev/null src/tests/fs/common/fstest_udf.c:1.1
--- /dev/null Wed Jun 26 19:29:24 2013
+++ src/tests/fs/common/fstest_udf.c Wed Jun 26 19:29:24 2013
@@ -0,0 +1,149 @@
+/* $NetBSD: fstest_udf.c,v 1.1 2013/06/26 19:29:24 reinoud 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 <signal.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+struct udftestargs {
+ struct ufs_args ta_uargs;
+ char ta_devpath[MAXPATHLEN];
+ char ta_imgpath[MAXPATHLEN];
+};
+
+int
+udf_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 udftestargs *args;
+ struct sigaction act, oact;
+
+ size /= 512;
+ snprintf(cmd, 1024, "newfs -F -s %"PRId64" %s >/dev/null", size, image);
+ memset(&act, 0, sizeof(act));
+ act.sa_handler = SIG_DFL;
+ sigaction(SIGCHLD, &act, &oact);
+ res = system(cmd);
+ sigaction(SIGCHLD, &oact, NULL);
+ 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.udf", 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;
+}
+__strong_alias(udflog_fstest_newfs,udf_fstest_newfs);
+
+int
+udf_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+ int res;
+ struct udftestargs *args = buf;
+
+ res = rump_pub_etfs_remove(args->ta_devpath);
+ if (res != 0) {
+ errno = res;
+ return -1;
+ }
+
+ res = unlink(args->ta_imgpath);
+ if (res != 0)
+ return res;
+
+ free(args);
+
+ return 0;
+}
+__strong_alias(udflog_fstest_delfs,udf_fstest_delfs);
+
+int
+udf_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+ int res;
+ struct udftestargs *args = buf;
+
+ res = rump_sys_mkdir(path, 0777);
+ if (res == -1)
+ return res;
+
+ res = rump_sys_mount(MOUNT_UDF, path, flags, &args->ta_uargs,
+ sizeof(args->ta_uargs));
+ return res;
+}
+
+int
+udf_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;
+}
+__strong_alias(udflog_fstest_unmount,udf_fstest_unmount);
