[src/trunk]: src/tests Substitute a surgical rump_server configuration for ru...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1731787cde00
branches:  trunk
changeset: 760192:1731787cde00
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Dec 30 16:58:07 2010 +0000

description:
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:

 tests/dev/cgd/t_cgd.sh                    |   9 ++++++---
 tests/dev/raidframe/t_raid.sh             |  17 +++++++++--------
 tests/net/icmp/t_ping2.sh                 |   9 ++++++---
 tests/usr.sbin/traceroute/t_traceroute.sh |  11 +++++++----
 4 files changed, 28 insertions(+), 18 deletions(-)

diffs (179 lines):

diff -r 0a6cdc9530eb -r 1731787cde00 tests/dev/cgd/t_cgd.sh
--- a/tests/dev/cgd/t_cgd.sh    Thu Dec 30 16:51:28 2010 +0000
+++ b/tests/dev/cgd/t_cgd.sh    Thu Dec 30 16:58:07 2010 +0000
@@ -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 @@
 
        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 @@
 
        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 -r 0a6cdc9530eb -r 1731787cde00 tests/dev/raidframe/t_raid.sh
--- a/tests/dev/raidframe/t_raid.sh     Thu Dec 30 16:51:28 2010 +0000
+++ b/tests/dev/raidframe/t_raid.sh     Thu Dec 30 16:58:07 2010 +0000
@@ -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 @@
 {
        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 @@
 {
        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 @@
        # 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 @@
 {
        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 @@
        # 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 @@
 {
        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 @@
        # 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}     \
diff -r 0a6cdc9530eb -r 1731787cde00 tests/net/icmp/t_ping2.sh
--- a/tests/net/icmp/t_ping2.sh Thu Dec 30 16:51:28 2010 +0000
+++ b/tests/net/icmp/t_ping2.sh Thu Dec 30 16:58:07 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_ping2.sh,v 1.3 2010/12/18 08:35:53 pooka Exp $
+#      $NetBSD: t_ping2.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.
 #
 
+netserver=\
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+
 atf_test_case basic cleanup
 basic_head()
 {
@@ -49,8 +52,8 @@
 basic_body()
 {
 
-       atf_check -s exit:0 rump_allserver unix://commsock1
-       atf_check -s exit:0 rump_allserver unix://commsock2
+       atf_check -s exit:0 ${netserver} unix://commsock1
+       atf_check -s exit:0 ${netserver} unix://commsock2
 
        docfg unix://commsock1 1.2.3.4
        docfg unix://commsock2 1.2.3.5
diff -r 0a6cdc9530eb -r 1731787cde00 tests/usr.sbin/traceroute/t_traceroute.sh
--- a/tests/usr.sbin/traceroute/t_traceroute.sh Thu Dec 30 16:51:28 2010 +0000
+++ b/tests/usr.sbin/traceroute/t_traceroute.sh Thu Dec 30 16:58:07 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_traceroute.sh,v 1.2 2010/12/18 08:34:56 pooka Exp $
+#      $NetBSD: t_traceroute.sh,v 1.3 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.
 #
 
+netserver=\
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+
 atf_test_case basic cleanup
 basic_head()
 {
@@ -50,9 +53,9 @@
 threeservers()
 {
 
-       atf_check -s exit:0 rump_allserver unix://commsock1
-       atf_check -s exit:0 rump_allserver unix://commsock2
-       atf_check -s exit:0 rump_allserver unix://commsock3
+       atf_check -s exit:0 ${netserver} unix://commsock1
+       atf_check -s exit:0 ${netserver} unix://commsock2
+       atf_check -s exit:0 ${netserver} unix://commsock3
 
        # configure endpoints
        cfgendpt unix://commsock1 1.2.3.4 1.2.3.1 bus1