From 8d307f3a0ba40d60d1e07d092b97fca30ace852d Mon Sep 17 00:00:00 2001 From: pooka Date: Wed, 15 Dec 2010 20:40:17 +0000 Subject: "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. --- tests/dev/Makefile | 4 +-- tests/dev/raid/Makefile | 8 ----- tests/dev/raid/t_raid.sh | 77 ------------------------------------------- tests/dev/raidframe/Makefile | 8 +++++ tests/dev/raidframe/t_raid.sh | 77 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 tests/dev/raid/Makefile delete mode 100644 tests/dev/raid/t_raid.sh create mode 100644 tests/dev/raidframe/Makefile create mode 100644 tests/dev/raidframe/t_raid.sh (limited to 'tests/dev') diff --git a/tests/dev/Makefile b/tests/dev/Makefile index 82204c5df6c..01365e68d19 100644 --- a/tests/dev/Makefile +++ b/tests/dev/Makefile @@ -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 TESTSDIR= ${TESTSBASE}/dev -TESTS_SUBDIRS+= audio cgd md raid scsipi sysmon +TESTS_SUBDIRS+= audio cgd md raidframe scsipi sysmon .include diff --git a/tests/dev/raid/Makefile b/tests/dev/raid/Makefile deleted file mode 100644 index e31dbbeda5f..00000000000 --- a/tests/dev/raid/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2010/12/15 20:37:52 pooka Exp $ -# - -TESTSDIR= ${TESTSBASE}/dev/raid - -TESTS_SH= t_raid - -.include diff --git a/tests/dev/raid/t_raid.sh b/tests/dev/raid/t_raid.sh deleted file mode 100644 index fa3dcb8f33f..00000000000 --- a/tests/dev/raid/t_raid.sh +++ /dev/null @@ -1,77 +0,0 @@ -# $NetBSD: t_raid.sh,v 1.1 2010/12/15 20:37:52 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 -} diff --git a/tests/dev/raidframe/Makefile b/tests/dev/raidframe/Makefile new file mode 100644 index 00000000000..942ce002723 --- /dev/null +++ b/tests/dev/raidframe/Makefile @@ -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 diff --git a/tests/dev/raidframe/t_raid.sh b/tests/dev/raidframe/t_raid.sh new file mode 100644 index 00000000000..22d3e93b208 --- /dev/null +++ b/tests/dev/raidframe/t_raid.sh @@ -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 +} -- cgit