Module Name:    src
Committed By:   pooka
Date:           Thu Feb  3 15:38:19 UTC 2011

Modified Files:
        src/tests: Makefile
Added Files:
        src/tests/usr.bin/rump_server: Makefile t_disk.sh

Log Message:
add tests for the -d functionality of rump_server(1)


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tests/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/rump_server/Makefile \
    src/tests/usr.bin/rump_server/t_disk.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/Makefile
diff -u src/tests/Makefile:1.28 src/tests/Makefile:1.29
--- src/tests/Makefile:1.28	Fri Jan  7 01:07:31 2011
+++ src/tests/Makefile	Thu Feb  3 15:38:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2011/01/07 01:07:31 pgoyette Exp $
+# $NetBSD: Makefile,v 1.29 2011/02/03 15:38:18 pooka Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@
 ATFFILE=	yes
 
 SUBDIR=		crypto dev fs games include ipf kernel lib libexec net
-SUBDIR+=	rump sbin sys syscall usr.sbin util
+SUBDIR+=	rump sbin sys syscall usr.bin usr.sbin util
 
 . if ${MACHINE} != "evbppc" && ${MKKMOD} != "no"
 SUBDIR+= modules

Added files:

Index: src/tests/usr.bin/rump_server/Makefile
diff -u /dev/null src/tests/usr.bin/rump_server/Makefile:1.1
--- /dev/null	Thu Feb  3 15:38:19 2011
+++ src/tests/usr.bin/rump_server/Makefile	Thu Feb  3 15:38:18 2011
@@ -0,0 +1,10 @@
+#	$NetBSD: Makefile,v 1.1 2011/02/03 15:38:18 pooka Exp $
+#
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/rump_server
+
+TESTS_SH=	t_disk
+
+.include <bsd.test.mk>
Index: src/tests/usr.bin/rump_server/t_disk.sh
diff -u /dev/null src/tests/usr.bin/rump_server/t_disk.sh:1.1
--- /dev/null	Thu Feb  3 15:38:19 2011
+++ src/tests/usr.bin/rump_server/t_disk.sh	Thu Feb  3 15:38:18 2011
@@ -0,0 +1,95 @@
+#	$NetBSD: t_disk.sh,v 1.1 2011/02/03 15:38:18 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'
+export RUMP_SERVER='unix://commsock'
+
+startsrv()
+{
+
+	atf_check -s exit:0 ${server} $@ ${RUMP_SERVER}
+}
+
+test_case()
+{
+	local name="${1}"; shift
+
+	atf_test_case "${name}" cleanup
+	eval "${name}_head() {  }"
+	eval "${name}_body() { \
+		${name}_prefun ; \
+		startsrv $@ ; \
+		${name} ; \
+	}"
+	eval "${name}_cleanup() { \
+		[ -f halted ] && return 0 ; rump.halt ;
+	}"
+}
+
+test_case size -d key=/img,hostpath=the.img,size=32k
+size()
+{
+	atf_check -s exit:0 -o inline:'32768\n' stat -f %z the.img
+}
+
+test_case offset -d key=/img,hostpath=the.img,size=32k,offset=16k
+offset()
+{
+	atf_check -s exit:0 -o inline:'49152\n' stat -f %z the.img
+}
+
+test_case notrunc -d key=/img,hostpath=the.img,size=8k,offset=16k
+notrunc_prefun()
+{
+	dd if=/dev/zero of=the.img bs=1 oseek=65535 count=1 
+}
+notrunc()
+{
+	atf_check -s exit:0 -o inline:'65536\n' stat -f %z the.img
+}
+
+test_case data -d key=/img,hostpath=the.img,size=8k,offset=16k
+data()
+{
+	echo 'test string' | dd of=testfile ibs=512 count=1 conv=sync
+	atf_check -s exit:0 -e ignore dd if=testfile rof=/img bs=512 count=1
+
+	# cheap fsync
+	atf_check -s exit:0 rump.halt
+	touch halted
+	atf_check -s exit:0 -e ignore -o file:testfile \
+	    dd if=the.img iseek=16k bs=1 count=512
+}
+
+atf_init_test_cases()
+{
+
+	atf_add_test_case size
+	atf_add_test_case offset
+	atf_add_test_case notrunc
+	atf_add_test_case data
+}

Reply via email to