Module Name: src
Committed By: pooka
Date: Wed Dec 15 20:40:18 UTC 2010
Modified Files:
src/tests/dev: Makefile
Added Files:
src/tests/dev/raidframe: Makefile t_raid.sh
Removed Files:
src/tests/dev/raid: Makefile t_raid.sh
Log Message:
"A few seconds later" I realized the kernel directory is dev/raidframe,
not dev/raid, so reflect this in the test dir. Affects location
for test of PR kern/44239.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/dev/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/dev/raid/Makefile \
src/tests/dev/raid/t_raid.sh
cvs rdiff -u -r0 -r1.1 src/tests/dev/raidframe/Makefile \
src/tests/dev/raidframe/t_raid.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/dev/Makefile
diff -u src/tests/dev/Makefile:1.6 src/tests/dev/Makefile:1.7
--- src/tests/dev/Makefile:1.6 Wed Dec 15 20:37:52 2010
+++ src/tests/dev/Makefile Wed Dec 15 20:40:17 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2010/12/15 20:37:52 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2010/12/15 20:40:17 pooka Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/dev
-TESTS_SUBDIRS+= audio cgd md raid scsipi sysmon
+TESTS_SUBDIRS+= audio cgd md raidframe scsipi sysmon
.include <bsd.test.mk>
Added files:
Index: src/tests/dev/raidframe/Makefile
diff -u /dev/null src/tests/dev/raidframe/Makefile:1.1
--- /dev/null Wed Dec 15 20:40:18 2010
+++ src/tests/dev/raidframe/Makefile Wed Dec 15 20:40:18 2010
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2010/12/15 20:40:18 pooka Exp $
+#
+
+TESTSDIR= ${TESTSBASE}/dev/raid
+
+TESTS_SH= t_raid
+
+.include <bsd.test.mk>
Index: src/tests/dev/raidframe/t_raid.sh
diff -u /dev/null src/tests/dev/raidframe/t_raid.sh:1.1
--- /dev/null Wed Dec 15 20:40:18 2010
+++ src/tests/dev/raidframe/t_raid.sh Wed Dec 15 20:40:18 2010
@@ -0,0 +1,77 @@
+# $NetBSD: t_raid.sh,v 1.1 2010/12/15 20:40:18 pooka Exp $
+#
+# Copyright (c) 2010 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.
+#
+
+makecfg()
+{
+ level=${1}
+ ncol=${2}
+
+ printf "START array\n1 ${ncol} 0\nSTART disks\n" > raid.conf
+ diskn=0
+ while [ ${ncol} -gt ${diskn} ] ; do
+ echo "/disk${diskn}" >> raid.conf
+ diskn=$((diskn+1))
+ done
+
+ printf "START layout\n32 1 1 ${level}\nSTART queue\nfifo 100\n" \
+ >> raid.conf
+}
+
+atf_test_case smalldisk cleanup
+raid1fail_head()
+{
+
+ atf_set "descr" "Checks the raidframe works on small disks"
+}
+
+smalldisk_body()
+{
+
+ makecfg 1 2
+ export RUMP_SERVER=unix://sock
+ atf_check -s exit:0 rump_allserver \
+ -d key=/disk0,hostpath=disk0.img,size=1m \
+ -d key=/disk1,hostpath=disk1.img,size=1m \
+ ${RUMP_SERVER}
+
+ atf_expect_fail "PR kern/44239" # ADJUST CLEANUP WHEN THIS IS FIXED!
+ atf_check -s exit:0 rump.raidctl -C raid.conf raid0
+}
+
+smalldisk_cleanup()
+{
+
+ export RUMP_SERVER=unix://sock
+ rump.halt
+ : server dumps currently, so reset error. remove this line when fixed
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case smalldisk
+}
