Module Name:    src
Committed By:   pooka
Date:           Thu Mar 10 20:02:27 UTC 2011

Modified Files:
        src/tests/fs: Makefile
Added Files:
        src/tests/fs/zfs: Makefile t_zpool.sh

Log Message:
Add one simple test case which checks that zpool create results in
a mounted file system.  Then run away as quickly as possible.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/tests/fs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/zfs/Makefile src/tests/fs/zfs/t_zpool.sh

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/Makefile
diff -u src/tests/fs/Makefile:1.20 src/tests/fs/Makefile:1.21
--- src/tests/fs/Makefile:1.20	Fri Feb 18 13:07:54 2011
+++ src/tests/fs/Makefile	Thu Mar 10 20:02:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/02/18 13:07:54 pooka Exp $
+# $NetBSD: Makefile,v 1.21 2011/03/10 20:02:26 pooka Exp $
 
 .include <bsd.own.mk>
 
@@ -10,6 +10,10 @@
 TESTS_SUBDIRS+=	tmpfs umapfs union
 TESTS_SUBDIRS+=	vfs
 
+.if ${MKZFS} != "no"
+TESTS_SUBDIRS+=	zfs
+.endif
+
 FILES= h_funcs.subr
 FILESDIR= ${TESTSDIR}
 

Added files:

Index: src/tests/fs/zfs/Makefile
diff -u /dev/null src/tests/fs/zfs/Makefile:1.1
--- /dev/null	Thu Mar 10 20:02:27 2011
+++ src/tests/fs/zfs/Makefile	Thu Mar 10 20:02:27 2011
@@ -0,0 +1,10 @@
+#	$NetBSD: Makefile,v 1.1 2011/03/10 20:02:27 pooka Exp $
+#
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/fs/zfs
+
+TESTS_SH=	t_zpool
+
+.include <bsd.test.mk>
Index: src/tests/fs/zfs/t_zpool.sh
diff -u /dev/null src/tests/fs/zfs/t_zpool.sh:1.1
--- /dev/null	Thu Mar 10 20:02:27 2011
+++ src/tests/fs/zfs/t_zpool.sh	Thu Mar 10 20:02:27 2011
@@ -0,0 +1,66 @@
+#	$NetBSD: t_zpool.sh,v 1.1 2011/03/10 20:02:27 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# 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.
+#
+
+server='rump_server -lrumpvfs -lrumpkern_solaris -lrumpfs_zfs -lrumpdev -lrumpdev_rnd -d key=/dk,hostpath=zfs.img,size=100m'
+
+export RUMP_SERVER=unix://zsuck
+
+atf_test_case create cleanup
+create_head()
+{
+	atf_set "descr" "basic zpool create"
+}
+
+IFS=' '
+exmount='rumpfs on / type rumpfs (local)
+jippo on /jippo type zfs (local)
+'
+
+create_body()
+{
+
+	atf_check -s exit:0 -o ignore -e ignore ${server} ${RUMP_SERVER}
+
+	export LD_PRELOAD=/usr/lib/librumphijack.so
+	export RUMPHIJACK=blanket=/dev/zfs:/dk:/jippo
+	atf_check -s exit:0 zpool create jippo /dk
+
+	export RUMPHIJACK=vfs=all
+	atf_check -s exit:0 -o inline:"${exmount}" mount
+}
+
+create_cleanup()
+{
+
+	rump.halt
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case create
+}

Reply via email to