Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests/fs Add a vfstest zfs attachment. This is a compile-ti...
details: https://anonhg.NetBSD.org/src/rev/657f31e7e374
branches: trunk
changeset: 781120:657f31e7e374
user: pooka <pooka%NetBSD.org@localhost>
date: Mon Aug 20 16:37:35 2012 +0000
description:
Add a vfstest zfs attachment. This is a compile-time option,
default off, due the large numbers of failing tests (some of them
look like quite trivial failures).
diffstat:
tests/fs/common/Makefile | 7 +-
tests/fs/common/fstest_zfs.c | 134 +++++++++++++++++++++++++++++++++++++++++++
tests/fs/common/h_fsmacros.h | 27 +++++++-
tests/fs/vfs/Makefile | 7 +-
4 files changed, 170 insertions(+), 5 deletions(-)
diffs (247 lines):
diff -r e5f471e1592b -r 657f31e7e374 tests/fs/common/Makefile
--- a/tests/fs/common/Makefile Mon Aug 20 16:01:37 2012 +0000
+++ b/tests/fs/common/Makefile Mon Aug 20 16:37:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/08/11 10:52:12 uch Exp $
+# $NetBSD: Makefile,v 1.8 2012/08/20 16:37:35 pooka Exp $
#
.include <bsd.own.mk>
@@ -8,6 +8,11 @@
fstest_nfs.c fstest_puffs.c fstest_rumpfs.c fstest_sysvbfs.c \
fstest_tmpfs.c fstest_v7fs.c
+.ifdef WANT_ZFS_TESTS
+SRCS+= fstest_zfs.c
+CPPFLAGS+=-DWANT_ZFS_TESTS
+.endif
+
WARNS= 3
.PATH: ${.CURDIR}/nfsrpc
diff -r e5f471e1592b -r 657f31e7e374 tests/fs/common/fstest_zfs.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/fs/common/fstest_zfs.c Mon Aug 20 16:37:35 2012 +0000
@@ -0,0 +1,134 @@
+/* $NetBSD: fstest_zfs.c,v 1.1 2012/08/20 16:37:35 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2010, 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 <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include "h_fsmacros.h"
+
+#define SRVPATH "zfssurvo"
+#define SRVURL "unix://" SRVPATH
+#define ZFSDEV "/zfsdev"
+
+int
+zfs_fstest_newfs(const atf_tc_t *tc, void **buf, const char *image,
+ off_t size, void *fspriv)
+{
+ int res;
+ int fd;
+
+ /* XXX: hardcoded zfs minimum size */
+ size = MAX(64*1024*1024, size);
+
+ res = rump_init();
+ if (res != 0) {
+ errno = res;
+ return -1;
+ }
+
+ /* create backing image, sparse file is enough */
+ if ((fd = open(image, O_RDWR | O_CREAT, 0777)) == -1)
+ return -1;
+ if (ftruncate(fd, size) == -1) {
+ close(fd);
+ return -1;
+ }
+ close(fd);
+
+ res = rump_pub_etfs_register(ZFSDEV, image, RUMP_ETFS_BLK);
+ if (res != 0) {
+ errno = res;
+ return -1;
+ }
+
+ res = rump_init_server(SRVURL);
+ if (res != 0) {
+ errno = res;
+ return -1;
+ }
+ *buf = NULL;
+
+ return 0;
+}
+
+int
+zfs_fstest_delfs(const atf_tc_t *tc, void *buf)
+{
+
+ unlink(SRVPATH);
+ return 0;
+}
+
+int
+zfs_fstest_mount(const atf_tc_t *tc, void *buf, const char *path, int flags)
+{
+ char tmpbuf[128];
+ int error;
+
+ /* set up the hijack env for running zpool */
+ setenv("RUMP_SERVER", SRVURL, 1);
+ snprintf(tmpbuf, sizeof(tmpbuf)-1, "blanket=/dev/zfs:%s:%s",
+ ZFSDEV, path);
+ setenv("RUMPHIJACK", tmpbuf, 1);
+ setenv("LD_PRELOAD", "/usr/lib/librumphijack.so", 1);
+
+ while (*path == '/')
+ path++;
+
+ /* run zpool create */
+ snprintf(tmpbuf, sizeof(tmpbuf)-1, "zpool create %s %s",
+ path, ZFSDEV);
+ if ((error = system(tmpbuf)) != 0) {
+ errno = error;
+ return -1;
+ }
+
+ return 0;
+}
+
+int
+zfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
+{
+
+ unmount(path, flags);
+ unlink(SRVPATH);
+
+ return 0;
+}
diff -r e5f471e1592b -r 657f31e7e374 tests/fs/common/h_fsmacros.h
--- a/tests/fs/common/h_fsmacros.h Mon Aug 20 16:01:37 2012 +0000
+++ b/tests/fs/common/h_fsmacros.h Mon Aug 20 16:37:35 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: h_fsmacros.h,v 1.35 2011/08/11 10:52:12 uch Exp $ */
+/* $NetBSD: h_fsmacros.h,v 1.36 2012/08/20 16:39:46 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -62,6 +62,7 @@
FSPROTOS(sysvbfs);
FSPROTOS(tmpfs);
FSPROTOS(v7fs);
+FSPROTOS(zfs);
#ifndef FSTEST_IMGNAME
#define FSTEST_IMGNAME "image.fs"
@@ -154,7 +155,7 @@
#define ATF_TP_FSADD(fs,func) \
ATF_TP_ADD_TC(tp,fs##_##func)
-#define ATF_TC_FSAPPLY(func,desc) \
+#define ATF_TC_FSAPPLY_NOZFS(func,desc) \
ATF_TC_FSADD(ext2fs,MOUNT_EXT2FS,func,desc) \
ATF_TC_FSADD(ffs,MOUNT_FFS,func,desc) \
ATF_TC_FSADD(ffslog,MOUNT_FFS,func,desc) \
@@ -168,7 +169,7 @@
ATF_TC_FSADD(tmpfs,MOUNT_TMPFS,func,desc) \
ATF_TC_FSADD(v7fs,MOUNT_V7FS,func,desc)
-#define ATF_TP_FSAPPLY(func) \
+#define ATF_TP_FSAPPLY_NOZFS(func) \
ATF_TP_FSADD(ext2fs,func); \
ATF_TP_FSADD(ffs,func); \
ATF_TP_FSADD(ffslog,func); \
@@ -182,6 +183,24 @@
ATF_TP_FSADD(tmpfs,func); \
ATF_TP_FSADD(v7fs,func);
+/* XXX: this will not scale */
+#ifdef WANT_ZFS_TESTS
+#define ATF_TC_FSAPPLY(func,desc) \
+ ATF_TC_FSAPPLY_NOZFS(func,desc) \
+ ATF_TC_FSADD(zfs,MOUNT_ZFS,func,desc)
+#define ATF_TP_FSAPPLY(func) \
+ ATF_TP_FSAPPLY_NOZFS(func) \
+ ATF_TP_FSADD(zfs,func);
+
+#else /* !WANT_ZFS_TESTS */
+
+#define ATF_TC_FSAPPLY(func,desc) \
+ ATF_TC_FSAPPLY_NOZFS(func,desc)
+#define ATF_TP_FSAPPLY(func) \
+ ATF_TP_FSAPPLY_NOZFS(func)
+
+#endif /* WANT_ZFS_TESTS */
+
/*
* Same as above, but generate a file system image first and perform
* tests for a r/o mount.
@@ -261,6 +280,8 @@
(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 FSTYPE_ZFS(tc)\
+ (strcmp(atf_tc_get_md_var(tc, "X-fs.type"), "zfs") == 0)
#define FSTEST_ENTER() \
if (rump_sys_chdir(FSTEST_MNTNAME) == -1) \
diff -r e5f471e1592b -r 657f31e7e374 tests/fs/vfs/Makefile
--- a/tests/fs/vfs/Makefile Mon Aug 20 16:01:37 2012 +0000
+++ b/tests/fs/vfs/Makefile Mon Aug 20 16:37:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/08/11 10:52:12 uch Exp $
+# $NetBSD: Makefile,v 1.17 2012/08/20 16:37:35 pooka Exp $
#
.include <bsd.own.mk>
@@ -38,4 +38,9 @@
LDADD+=-lutil
+.ifdef WANT_ZFS_TESTS
+LDADD+=-lrumpfs_zfs -lrumpkern_solaris -lrumpdev_rnd
+CPPFLAGS+=-DWANT_ZFS_TESTS
+.endif
+
.include <bsd.test.mk>
Home |
Main Index |
Thread Index |
Old Index