diff options
| author | pooka <pooka@NetBSD.org> | 2010-12-30 16:58:07 +0000 |
|---|---|---|
| committer | pooka <pooka@NetBSD.org> | 2010-12-30 16:58:07 +0000 |
| commit | b020edee824145b8e28b8031dc005f2f3631aa8e (patch) | |
| tree | 4cea241375aa2867abddfee867477cf7b1f87366 /tests/dev | |
| parent | 7c72173ee699b4cbcdfde6340d8d57a577e66649 (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')
| -rw-r--r-- | tests/dev/cgd/t_cgd.sh | 9 | ||||
| -rw-r--r-- | tests/dev/raidframe/t_raid.sh | 17 |
2 files changed, 15 insertions, 11 deletions
diff --git a/tests/dev/cgd/t_cgd.sh b/tests/dev/cgd/t_cgd.sh index 46dc22cf7f1..6abd30bcd86 100644 --- a/tests/dev/cgd/t_cgd.sh +++ b/tests/dev/cgd/t_cgd.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_cgd.sh,v 1.3 2010/12/15 19:14:37 pooka Exp $ +# $NetBSD: t_cgd.sh,v 1.4 2010/12/30 16:58:07 pooka Exp $ # # Copyright (c) 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -25,6 +25,9 @@ # POSSIBILITY OF SUCH DAMAGE. # +cgdserver=\ +"rump_server -lrumpvfs -lrumpkern_crypto -lrumpdev -lrumpdev_disk -lrumpdev_cgd" + atf_test_case basic cleanup basic_head() { @@ -37,7 +40,7 @@ basic_body() d=$(atf_get_srcdir) atf_check -s exit:0 \ - rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock + ${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock export RUMP_SERVER=unix://csock atf_check -s exit:0 sh -c "echo 12345 | \ @@ -67,7 +70,7 @@ wrongpass_body() d=$(atf_get_srcdir) atf_check -s exit:0 \ - rump_allserver -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock + ${cgdserver} -d key=/dev/dk,hostpath=dk.img,size=1m unix://csock export RUMP_SERVER=unix://csock atf_check -s exit:0 sh -c "echo 12345 | \ 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} \ |
