summaryrefslogtreecommitdiff
path: root/tests/dev/raidframe
diff options
context:
space:
mode:
authorpooka <pooka@NetBSD.org>2010-12-30 16:58:07 +0000
committerpooka <pooka@NetBSD.org>2010-12-30 16:58:07 +0000
commitb020edee824145b8e28b8031dc005f2f3631aa8e (patch)
tree4cea241375aa2867abddfee867477cf7b1f87366 /tests/dev/raidframe
parent7c72173ee699b4cbcdfde6340d8d57a577e66649 (diff)
Substitute a surgical rump_server configuration for rump_allserver
now that it's possible. With warm fs cache, the startup time of the former is 0.01s and the latter 0.1s. With cold caches it's 0.2s vs 2s.
Diffstat (limited to 'tests/dev/raidframe')
-rw-r--r--tests/dev/raidframe/t_raid.sh17
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/dev/raidframe/t_raid.sh b/tests/dev/raidframe/t_raid.sh
index 75e97d9a156..b455ef83ba8 100644
--- a/tests/dev/raidframe/t_raid.sh
+++ b/tests/dev/raidframe/t_raid.sh
@@ -1,4 +1,4 @@
-# $NetBSD: t_raid.sh,v 1.4 2010/12/18 09:44:41 pooka Exp $
+# $NetBSD: t_raid.sh,v 1.5 2010/12/30 16:58:07 pooka Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -27,6 +27,7 @@
rawpart=`sysctl -n kern.rawpartition | tr '01234' 'abcde'`
rawraid=/dev/rraid0${rawpart}
+raidserver="rump_server -lrumpvfs -lrumpdev -lrumpdev_disk -lrumpdev_raidframe"
makecfg()
{
@@ -55,7 +56,7 @@ smalldisk_body()
{
makecfg 1 2
export RUMP_SERVER=unix://sock
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=1m \
-d key=/disk1,hostpath=disk1.img,size=1m \
${RUMP_SERVER}
@@ -85,7 +86,7 @@ raid1_compfail_body()
{
makecfg 1 2
export RUMP_SERVER=unix://sock
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
${RUMP_SERVER}
@@ -102,7 +103,7 @@ raid1_compfail_body()
# restart server with failed component
rump.halt
rm disk1.img # FAIL
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
${RUMP_SERVER}
@@ -131,7 +132,7 @@ raid1_comp0fail_body()
{
makecfg 1 2
export RUMP_SERVER=unix://sock
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
${RUMP_SERVER}
@@ -143,7 +144,7 @@ raid1_comp0fail_body()
# restart server with failed component
rump.halt
rm disk0.img # FAIL
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
${RUMP_SERVER}
@@ -169,7 +170,7 @@ raid5_compfail_body()
{
makecfg 5 3
export RUMP_SERVER=unix://sock
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
-d key=/disk2,hostpath=disk2.img,size=${RAID_MEDIASIZE} \
@@ -187,7 +188,7 @@ raid5_compfail_body()
# restart server with failed component
rump.halt
rm disk2.img # FAIL
- atf_check -s exit:0 rump_allserver \
+ atf_check -s exit:0 ${raidserver} \
-d key=/disk0,hostpath=disk0.img,size=${RAID_MEDIASIZE} \
-d key=/disk1,hostpath=disk1.img,size=${RAID_MEDIASIZE} \
-d key=/disk2,hostpath=disk2.img,size=${RAID_MEDIASIZE} \