[src/trunk]: src Get rid of all the -lrumpdev and -lrumpvfs that are no longe...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Get rid of all the -lrumpdev and -lrumpvfs that are no longe...
From: bad <bad%NetBSD.org@localhost>
Date: Mon, 13 May 2019 21:44:44 +0000
details:   https://anonhg.NetBSD.org/src/rev/aec72ef6fc02
branches:  trunk
changeset: 451286:aec72ef6fc02
user:      bad <bad%NetBSD.org@localhost>
date:      Mon May 13 17:55:07 2019 +0000

description:
Get rid of all the -lrumpdev and -lrumpvfs that are no longer needed
after moving rump's mainbus from rumpdev to rumpkern.

Produces the same atf-run results as before.

diffstat:

 tests/fs/nfs/t_rquotad.sh                 |   4 ++--
 tests/include/sys/Makefile                |   4 ++--
 tests/lib/librumpclient/Makefile          |   4 +---
 tests/lib/librumpclient/t_exec.sh         |   4 ++--
 tests/lib/librumpclient/t_fd.c            |   4 ++--
 tests/lib/librumphijack/t_tcpip.sh        |  13 ++++++-------
 tests/net/arp/t_arp.sh                    |   4 ++--
 tests/net/bpfjit/Makefile                 |   4 ++--
 tests/net/icmp/Makefile                   |   4 ++--
 tests/net/icmp/t_ping2.sh                 |   4 ++--
 tests/net/if/Makefile                     |   4 ++--
 tests/net/if/t_ifconf.sh                  |   4 ++--
 tests/net/if/t_ifconfig.sh                |   4 ++--
 tests/net/if_loop/Makefile                |   4 ++--
 tests/net/if_tap/t_tap.sh                 |  12 ++++++------
 tests/net/if_tun/t_tun.sh                 |   4 ++--
 tests/net/mpls/t_ldp_regen.sh             |   4 ++--
 tests/net/mpls/t_mpls_fw.sh               |   4 ++--
 tests/net/mpls/t_mpls_fw6.sh              |   4 ++--
 tests/net/mpls/t_mpls_fw64.sh             |   4 ++--
 tests/net/mpls/t_rfc4182.sh               |   4 ++--
 tests/net/net/Makefile                    |   6 +++---
 tests/net/net/t_ipv6address.sh            |   4 ++--
 tests/net/net_common.sh                   |  12 ++++++------
 tests/net/route/t_change.sh               |   5 ++---
 tests/rump/rumpkern/t_sp.sh               |   6 +++---
 tests/rump/rumpnet/t_shmif.sh             |   4 ++--
 tests/usr.sbin/traceroute/t_traceroute.sh |   4 ++--
 usr.sbin/npf/npftest/Makefile             |   1 -
 29 files changed, 69 insertions(+), 74 deletions(-)

diffs (truncated from 593 to 300 lines):

diff -r 212a1f5474f5 -r aec72ef6fc02 tests/fs/nfs/t_rquotad.sh
--- a/tests/fs/nfs/t_rquotad.sh Mon May 13 17:50:30 2019 +0000
+++ b/tests/fs/nfs/t_rquotad.sh Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_rquotad.sh,v 1.6 2019/03/08 08:35:58 msaitoh Exp $ 
+# $NetBSD: t_rquotad.sh,v 1.7 2019/05/13 17:55:07 bad Exp $ 
 #
 #  Copyright (c) 2011 Manuel Bouyer
 #  All rights reserved.
@@ -114,7 +114,7 @@
        unset RUMPHIJACK
        unset LD_PRELOAD
 
-       atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet -lrumpdev   \
+       atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet             \
             -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif -lrumpfs_nfs\
             ${RUMP_SERVER}
 
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/include/sys/Makefile
--- a/tests/include/sys/Makefile        Mon May 13 17:50:30 2019 +0000
+++ b/tests/include/sys/Makefile        Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/10/02 04:15:56 pgoyette Exp $
+# $NetBSD: Makefile,v 1.14 2019/05/13 17:55:08 bad Exp $
 
 NOMAN=         # defined
 
@@ -21,7 +21,7 @@
 TESTS_C+= t_socket
 CPPFLAGS.t_socket.c+=  -D_KERNTYPES
 LDADD.t_socket+=       -lrumpnet_local -lrumpnet_net -lrumpnet
-LDADD.t_socket+=       -lrumpvfs -lrump -lrumpuser -lpthread -lrumpdev
+LDADD.t_socket+=       -lrumpvfs -lrump -lrumpuser -lpthread
 .endif
 
 .include <bsd.test.mk>
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/lib/librumpclient/Makefile
--- a/tests/lib/librumpclient/Makefile  Mon May 13 17:50:30 2019 +0000
+++ b/tests/lib/librumpclient/Makefile  Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2016/10/06 20:14:11 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2019/05/13 17:55:08 bad Exp $
 #
 
 .include <bsd.own.mk>
@@ -17,8 +17,6 @@
 CPPFLAGS+=     -D_KERNTYPES
 
 LDADD+= -lrumpclient
-LDADD+= -lrumpdev
-LDADD+= -lrumpvfs
 LDADD.h_execthr= -lpthread
 
 .include <bsd.test.mk>
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/lib/librumpclient/t_exec.sh
--- a/tests/lib/librumpclient/t_exec.sh Mon May 13 17:50:30 2019 +0000
+++ b/tests/lib/librumpclient/t_exec.sh Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: t_exec.sh,v 1.9 2016/08/10 21:10:18 kre Exp $
+#       $NetBSD: t_exec.sh,v 1.10 2019/05/13 17:55:08 bad Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -25,7 +25,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-rumpsrv='rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpdev -lrumpvfs'
+rumpsrv='rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet'
 export RUMP_SERVER=unix://csock
 export RUMPHIJACK_RETRYCONNECT='die'
 
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/lib/librumpclient/t_fd.c
--- a/tests/lib/librumpclient/t_fd.c    Mon May 13 17:50:30 2019 +0000
+++ b/tests/lib/librumpclient/t_fd.c    Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: t_fd.c,v 1.6 2017/01/13 21:30:41 christos Exp $        */
+/*     $NetBSD: t_fd.c,v 1.7 2019/05/13 17:55:08 bad Exp $     */
 
 /*
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -110,7 +110,7 @@
 
        signal(SIGIO, gotsig);
        RZ(system("rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet "
-           "-lrumpdev -lrumpvfs " RUMPSERV));
+           RUMPSERV));
        RL(setenv("RUMP_SERVER", RUMPSERV, 1));
 
        RL(rumpclient_init());
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/lib/librumphijack/t_tcpip.sh
--- a/tests/lib/librumphijack/t_tcpip.sh        Mon May 13 17:50:30 2019 +0000
+++ b/tests/lib/librumphijack/t_tcpip.sh        Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: t_tcpip.sh,v 1.18 2016/08/13 11:22:11 christos Exp $
+#       $NetBSD: t_tcpip.sh,v 1.19 2019/05/13 17:55:08 bad Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -25,8 +25,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-rumpnetlibs="-lrumpnet -lrumpnet_net -lrumpnet_netinet6 -lrumpnet_netinet"
-rumpnetsrv="rump_server $rumpnetlibs -lrumpdev"
+rumpnetsrv="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
 export RUMP_SERVER=unix://csock
 
 atf_test_case http cleanup
@@ -38,7 +37,7 @@
 http_body()
 {
 
-       atf_check -s exit:0 ${rumpnetsrv} ${RUMP_SERVER}
+       atf_check -s exit:0 ${rumpnetsrv} -lrumpnet_netinet6 ${RUMP_SERVER}
 
        # start bozo in daemon mode
        atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \
@@ -206,7 +205,7 @@
        unset LD_PRELOAD
 
        # at least the kernel server is easier
-       atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet -lrumpdev   \
+       atf_check -s exit:0 rump_server -lrumpvfs -lrumpnet             \
            -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif -lrumpfs_nfs\
            ${RUMP_SERVER}
 
@@ -233,7 +232,7 @@
 nfs_body()
 {
        test_nfs -lrumpvfs -lrumpdev -lrumpnet -lrumpnet_net            \
-           -lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif -lrumpdev \
+           -lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif           \
            -lrumpdev_disk -lrumpfs_ffs -lrumpfs_nfs -lrumpfs_nfsserver \
            -d key=/dk,hostpath=ffs.img,size=host
 }
@@ -255,7 +254,7 @@
 {
        [ `uname -m` = "i386" ] || atf_skip "test currently valid only on i386"
        test_nfs -lrumpvfs -lrumpdev -lrumpnet -lrumpnet_net            \
-           -lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif -lrumpdev \
+           -lrumpnet_netinet -lrumpnet_local -lrumpnet_shmif           \
            -lrumpdev_disk -d key=/dk,hostpath=ffs.img,size=host
 }
 
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/net/arp/t_arp.sh
--- a/tests/net/arp/t_arp.sh    Mon May 13 17:50:30 2019 +0000
+++ b/tests/net/arp/t_arp.sh    Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_arp.sh,v 1.36 2018/04/06 09:23:36 ozaki-r Exp $
+#      $NetBSD: t_arp.sh,v 1.37 2019/05/13 17:55:08 bad Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -464,7 +464,7 @@
        local type=$1
 
        rump_server_start $SOCKSRC
-       rump_server_start $SOCKDST tap
+       rump_server_fs_start $SOCKDST tap
 
        setup_dst_server
        setup_src_server
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/net/bpfjit/Makefile
--- a/tests/net/bpfjit/Makefile Mon May 13 17:50:30 2019 +0000
+++ b/tests/net/bpfjit/Makefile Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/08 15:01:59 pgoyette Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/13 17:55:08 bad Exp $
 #
 
 .include <bsd.own.mk>
@@ -14,6 +14,6 @@
 
 LDADD+=                -lrumpnet_bpfjit -lrumpkern_sljit
 LDADD+=                -lrumpdev_bpf -lrumpnet_net -lrumpnet
-LDADD+=                -lrump -lrumpuser -lpthread -lrumpdev -lrumpvfs
+LDADD+=                -lrump -lrumpuser -lpthread
 
 .include <bsd.test.mk>
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/net/icmp/Makefile
--- a/tests/net/icmp/Makefile   Mon May 13 17:50:30 2019 +0000
+++ b/tests/net/icmp/Makefile   Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/11/24 09:06:09 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.10 2019/05/13 17:55:08 bad Exp $
 #
 
 .include <bsd.own.mk>
@@ -14,6 +14,6 @@
 .endfor
 
 LDADD+=                -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=                -lrump -lrumpuser -lrump -lpthread -lrumpdev -lrumpvfs
+LDADD+=                -lrump -lrumpuser -lrump -lpthread
 
 .include <bsd.test.mk>
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/net/icmp/t_ping2.sh
--- a/tests/net/icmp/t_ping2.sh Mon May 13 17:50:30 2019 +0000
+++ b/tests/net/icmp/t_ping2.sh Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_ping2.sh,v 1.5 2016/08/10 22:17:44 kre Exp $
+#      $NetBSD: t_ping2.sh,v 1.6 2019/05/13 17:55:08 bad Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -26,7 +26,7 @@
 #
 
 netserver=\
-"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif -lrumpdev"
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
 
 atf_test_case basic cleanup
 basic_head()
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/net/if/Makefile
--- a/tests/net/if/Makefile     Mon May 13 17:50:30 2019 +0000
+++ b/tests/net/if/Makefile     Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/02/14 08:43:06 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/13 17:55:08 bad Exp $
 #
 
 .include <bsd.own.mk>
@@ -16,6 +16,6 @@
 BINDIR.ifconf= ${TESTSDIR}
 
 LDADD.t_compat=                -lrumpnet_shmif -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump
-LDADD.t_compat+=       -lrumpuser -lrump -lpthread -lrumpdev -lrumpvfs
+LDADD.t_compat+=       -lrumpuser -lrump -lpthread
 
 .include <bsd.test.mk>
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/net/if/t_ifconf.sh
--- a/tests/net/if/t_ifconf.sh  Mon May 13 17:50:30 2019 +0000
+++ b/tests/net/if/t_ifconf.sh  Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_ifconf.sh,v 1.3 2016/08/10 22:30:02 kre Exp $
+# $NetBSD: t_ifconf.sh,v 1.4 2019/05/13 17:55:08 bad Exp $
 #
 # Copyright (c) 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -28,7 +28,7 @@
 RUMP_SERVER1=unix://./r1
 
 RUMP_FLAGS=\
-"-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif -lrumpdev"
+"-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
 
 atf_test_case basic cleanup
 basic_head()
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/net/if/t_ifconfig.sh
--- a/tests/net/if/t_ifconfig.sh        Mon May 13 17:50:30 2019 +0000
+++ b/tests/net/if/t_ifconfig.sh        Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_ifconfig.sh,v 1.18 2017/03/16 09:43:56 ozaki-r Exp $
+# $NetBSD: t_ifconfig.sh,v 1.19 2019/05/13 17:55:08 bad Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -30,7 +30,7 @@
 
 RUMP_FLAGS=\
 "-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_shmif"
-RUMP_FLAGS="${RUMP_FLAGS} -lrumpdev"
+RUMP_FLAGS="${RUMP_FLAGS}"
 
 TIMEOUT=3
 
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/net/if_loop/Makefile
--- a/tests/net/if_loop/Makefile        Mon May 13 17:50:30 2019 +0000
+++ b/tests/net/if_loop/Makefile        Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2017/02/28 03:32:11 ozaki-r Exp $
+#      $NetBSD: Makefile,v 1.5 2019/05/13 17:55:08 bad Exp $
 #
 
 .include <bsd.own.mk>
@@ -8,7 +8,7 @@
 TESTS_C=       t_pr
 
 LDADD+=                -lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=                -lrump -lrumpuser -lrump -lpthread -lrumpdev -lrumpvfs
+LDADD+=                -lrump -lrumpuser -lrump -lpthread
 
 .for name in basic
 TESTS_SH+=             t_${name}
diff -r 212a1f5474f5 -r aec72ef6fc02 tests/net/if_tap/t_tap.sh
--- a/tests/net/if_tap/t_tap.sh Mon May 13 17:50:30 2019 +0000
+++ b/tests/net/if_tap/t_tap.sh Mon May 13 17:55:07 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_tap.sh,v 1.8 2018/03/22 09:21:24 ozaki-r Exp $
+#      $NetBSD: t_tap.sh,v 1.9 2019/05/13 17:55:08 bad Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -49,7 +49,7 @@
 tap_create_destroy_body()
 {
 
-       rump_server_start $SOCK_LOCAL netinet6 tap
Prev by Date: [src/trunk]: src/sys/arch/i386/stand/dosboot Remove dead code.
Next by Date: [src/trunk]: src/etc/rc.d Remove comment, since there is no parsing anymore.
Previous by Thread: [src/trunk]: src/sys/arch/i386/stand/dosboot Remove dead code.
Next by Thread: [src/trunk]: src/etc/rc.d Remove comment, since there is no parsing anymore.
Indexes:
Home | Main Index | Thread Index | Old Index