[src/trunk]: src Retire h_simpleserver and use rump_server instead.

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

details:   https://anonhg.NetBSD.org/src/rev/52c118f7ea1a
branches:  trunk
changeset: 759589:52c118f7ea1a
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Dec 13 13:39:42 2010 +0000

description:
Retire h_simpleserver and use rump_server instead.

diffstat:

 distrib/sets/lists/tests/mi                   |  10 +++++-----
 tests/rump/rumpkern/Makefile                  |   4 ++--
 tests/rump/rumpkern/h_server/Makefile         |  17 -----------------
 tests/rump/rumpkern/h_server/h_simpleserver.c |  27 ---------------------------
 tests/rump/rumpkern/t_sp.sh                   |   8 +++-----
 5 files changed, 10 insertions(+), 56 deletions(-)

diffs (130 lines):

diff -r 0b686d8f37e3 -r 52c118f7ea1a distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Mon Dec 13 13:38:18 2010 +0000
+++ b/distrib/sets/lists/tests/mi       Mon Dec 13 13:39:42 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.171 2010/12/12 12:53:35 pooka Exp $
+# $NetBSD: mi,v 1.172 2010/12/13 13:39:42 pooka Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -415,8 +415,8 @@
 ./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_reboot.debug                    tests-obsolete          obsolete
 ./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_simplecli.debug                 tests-syscall-debug     debug,atf
 ./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_stresscli.debug                 tests-syscall-debug     debug,atf
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_server                   tests-syscall-debug
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_server/h_simpleserver.debug                      tests-syscall-debug     debug,atf
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_server                   tests-obsolete  obsolete
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_server/h_simpleserver.debug                      tests-obsolete  obsolete
 ./usr/libdata/debug/usr/tests/rump/rumpvfs                             tests-syscall-debug
 ./usr/libdata/debug/usr/tests/rump/rumpvfs/t_etfs.debug                tests-syscall-debug     debug,atf
 ./usr/libdata/debug/usr/tests/rump/rumpvfs/t_p2kifs.debug              tests-syscall-debug     debug,atf
@@ -1653,8 +1653,8 @@
 ./usr/tests/rump/rumpkern/h_client/h_reboot            tests-obsolete          obsolete
 ./usr/tests/rump/rumpkern/h_client/h_simplecli         tests-rump-tests        atf
 ./usr/tests/rump/rumpkern/h_client/h_stresscli         tests-rump-tests        atf
-./usr/tests/rump/rumpkern/h_server                     tests-rump-tests
-./usr/tests/rump/rumpkern/h_server/h_simpleserver              tests-rump-tests        atf
+./usr/tests/rump/rumpkern/h_server                     tests-obsolete  obsolete
+./usr/tests/rump/rumpkern/h_server/h_simpleserver              tests-obsolete  obsolete
 ./usr/tests/rump/rumpvfs                       tests-rump-tests
 ./usr/tests/rump/rumpvfs/Atffile               tests-rump-tests        atf
 ./usr/tests/rump/rumpvfs/t_etfs                tests-rump-tests        atf
diff -r 0b686d8f37e3 -r 52c118f7ea1a tests/rump/rumpkern/Makefile
--- a/tests/rump/rumpkern/Makefile      Mon Dec 13 13:38:18 2010 +0000
+++ b/tests/rump/rumpkern/Makefile      Mon Dec 13 13:39:42 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/11/30 22:09:15 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2010/12/13 13:39:42 pooka Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,7 @@
 
 TESTS_SH=      t_sp
 
-SUBDIR+=       h_server h_client
+SUBDIR+=       h_client
 
 ADD_TO_LD=     -lrumpvfs -lrump -lrumpuser -lpthread
 LDADD.t_modlinkset+=   -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos 
diff -r 0b686d8f37e3 -r 52c118f7ea1a tests/rump/rumpkern/h_server/Makefile
--- a/tests/rump/rumpkern/h_server/Makefile     Mon Dec 13 13:38:18 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2010/11/30 22:09:15 pooka Exp $
-#
-
-.include <bsd.own.mk>
-
-TESTSDIR=      ${TESTSBASE}/rump/rumpkern/h_server
-
-TESTS_C=       h_simpleserver
-
-ATFFILE=       no
-
-LDADD+=        -lrump -lrumpuser -lpthread
-
-WARNS= 4
-NOMAN=
-
-.include <bsd.test.mk>
diff -r 0b686d8f37e3 -r 52c118f7ea1a tests/rump/rumpkern/h_server/h_simpleserver.c
--- a/tests/rump/rumpkern/h_server/h_simpleserver.c     Mon Dec 13 13:38:18 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*     $NetBSD: h_simpleserver.c,v 1.1 2010/11/30 22:09:15 pooka Exp $ */
-
-#include <sys/types.h>
-
-#include <rump/rump.h>
-
-#include <err.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#define NOFAIL(e) do { int rv = e; if (rv) err(1, #e); } while (/*CONSTCOND*/0)
-
-int
-main(int argc, char *argv[])
-{
-
-       if (argc != 2)
-               exit(1);
-
-       NOFAIL(rump_daemonize_begin());
-       NOFAIL(rump_init());
-       NOFAIL(rump_init_server(argv[1]));
-       NOFAIL(rump_daemonize_done(RUMP_DAEMONIZE_SUCCESS));
-
-       for (;;)
-               pause();
-}
diff -r 0b686d8f37e3 -r 52c118f7ea1a tests/rump/rumpkern/t_sp.sh
--- a/tests/rump/rumpkern/t_sp.sh       Mon Dec 13 13:38:18 2010 +0000
+++ b/tests/rump/rumpkern/t_sp.sh       Mon Dec 13 13:39:42 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_sp.sh,v 1.2 2010/12/12 12:51:19 pooka Exp $
+#      $NetBSD: t_sp.sh,v 1.3 2010/12/13 13:39:42 pooka Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -37,8 +37,7 @@
 
        export RUMP_SERVER=unix://commsock
 
-       atf_check -s exit:0 \
-           $(atf_get_srcdir)/h_server/h_simpleserver ${RUMP_SERVER}
+       atf_check -s exit:0 rump_server ${RUMP_SERVER}
 
        atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_simplecli
 }
@@ -62,8 +61,7 @@
 
        export RUMP_SERVER=unix://commsock
 
-       atf_check -s exit:0 \
-           $(atf_get_srcdir)/h_server/h_simpleserver ${RUMP_SERVER}
+       atf_check -s exit:0 rump_server ${RUMP_SERVER}
 
        atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_stresscli ${stresst}
 }