Module Name: src
Committed By: bad
Date: Mon May 13 17:55:09 UTC 2019
Modified Files:
src/tests/fs/nfs: t_rquotad.sh
src/tests/include/sys: Makefile
src/tests/lib/librumpclient: Makefile t_exec.sh t_fd.c
src/tests/lib/librumphijack: t_tcpip.sh
src/tests/net: net_common.sh
src/tests/net/arp: t_arp.sh
src/tests/net/bpfjit: Makefile
src/tests/net/icmp: Makefile t_ping2.sh
src/tests/net/if: Makefile t_ifconf.sh t_ifconfig.sh
src/tests/net/if_loop: Makefile
src/tests/net/if_tap: t_tap.sh
src/tests/net/if_tun: t_tun.sh
src/tests/net/mpls: t_ldp_regen.sh t_mpls_fw.sh t_mpls_fw6.sh
t_mpls_fw64.sh t_rfc4182.sh
src/tests/net/net: Makefile t_ipv6address.sh
src/tests/net/route: t_change.sh
src/tests/rump/rumpkern: t_sp.sh
src/tests/rump/rumpnet: t_shmif.sh
src/tests/usr.sbin/traceroute: t_traceroute.sh
src/usr.sbin/npf/npftest: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/nfs/t_rquotad.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/include/sys/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/librumpclient/Makefile \
src/tests/lib/librumpclient/t_exec.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/librumpclient/t_fd.c
cvs rdiff -u -r1.18 -r1.19 src/tests/lib/librumphijack/t_tcpip.sh
cvs rdiff -u -r1.30 -r1.31 src/tests/net/net_common.sh
cvs rdiff -u -r1.36 -r1.37 src/tests/net/arp/t_arp.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/net/bpfjit/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/net/icmp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/net/icmp/t_ping2.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/net/if/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/net/if/t_ifconf.sh
cvs rdiff -u -r1.18 -r1.19 src/tests/net/if/t_ifconfig.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/if_loop/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tests/net/if_tap/t_tap.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_tun/t_tun.sh
cvs rdiff -u -r1.7 -r1.8 src/tests/net/mpls/t_ldp_regen.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/net/mpls/t_mpls_fw.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/mpls/t_mpls_fw6.sh \
src/tests/net/mpls/t_mpls_fw64.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/mpls/t_rfc4182.sh
cvs rdiff -u -r1.21 -r1.22 src/tests/net/net/Makefile
cvs rdiff -u -r1.14 -r1.15 src/tests/net/net/t_ipv6address.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/net/route/t_change.sh
cvs rdiff -u -r1.13 -r1.14 src/tests/rump/rumpkern/t_sp.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/rump/rumpnet/t_shmif.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.sbin/traceroute/t_traceroute.sh
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/npf/npftest/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/nfs/t_rquotad.sh
diff -u src/tests/fs/nfs/t_rquotad.sh:1.6 src/tests/fs/nfs/t_rquotad.sh:1.7
--- src/tests/fs/nfs/t_rquotad.sh:1.6 Fri Mar 8 08:35:58 2019
+++ src/tests/fs/nfs/t_rquotad.sh Mon May 13 17:55:07 2019
@@ -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 @@ get_nfs_quota()
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}
Index: src/tests/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.13 src/tests/include/sys/Makefile:1.14
--- src/tests/include/sys/Makefile:1.13 Mon Oct 2 04:15:56 2017
+++ src/tests/include/sys/Makefile Mon May 13 17:55:08 2019
@@ -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 @@ LDADD.t_bitops+= -lm
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>
Index: src/tests/lib/librumpclient/Makefile
diff -u src/tests/lib/librumpclient/Makefile:1.9 src/tests/lib/librumpclient/Makefile:1.10
--- src/tests/lib/librumpclient/Makefile:1.9 Thu Oct 6 20:14:11 2016
+++ src/tests/lib/librumpclient/Makefile Mon May 13 17:55:08 2019
@@ -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 @@ PROGS+= h_execthr
CPPFLAGS+= -D_KERNTYPES
LDADD+= -lrumpclient
-LDADD+= -lrumpdev
-LDADD+= -lrumpvfs
LDADD.h_execthr= -lpthread
.include <bsd.test.mk>
Index: src/tests/lib/librumpclient/t_exec.sh
diff -u src/tests/lib/librumpclient/t_exec.sh:1.9 src/tests/lib/librumpclient/t_exec.sh:1.10
--- src/tests/lib/librumpclient/t_exec.sh:1.9 Wed Aug 10 21:10:18 2016
+++ src/tests/lib/librumpclient/t_exec.sh Mon May 13 17:55:08 2019
@@ -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'
Index: src/tests/lib/librumpclient/t_fd.c
diff -u src/tests/lib/librumpclient/t_fd.c:1.6 src/tests/lib/librumpclient/t_fd.c:1.7
--- src/tests/lib/librumpclient/t_fd.c:1.6 Fri Jan 13 21:30:41 2017
+++ src/tests/lib/librumpclient/t_fd.c Mon May 13 17:55:08 2019
@@ -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 @@ ATF_TC_BODY(sigio, tc)
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());
Index: src/tests/lib/librumphijack/t_tcpip.sh
diff -u src/tests/lib/librumphijack/t_tcpip.sh:1.18 src/tests/lib/librumphijack/t_tcpip.sh:1.19
--- src/tests/lib/librumphijack/t_tcpip.sh:1.18 Sat Aug 13 11:22:11 2016
+++ src/tests/lib/librumphijack/t_tcpip.sh Mon May 13 17:55:08 2019
@@ -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_head()
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 @@ test_nfs()
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_head()
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 @@ nfs_autoload_body()
{
[ `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
}
Index: src/tests/net/net_common.sh
diff -u src/tests/net/net_common.sh:1.30 src/tests/net/net_common.sh:1.31
--- src/tests/net/net_common.sh:1.30 Thu Apr 18 07:56:04 2019
+++ src/tests/net/net_common.sh Mon May 13 17:55:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: net_common.sh,v 1.30 2019/04/18 07:56:04 ozaki-r Exp $
+# $NetBSD: net_common.sh,v 1.31 2019/05/13 17:55:08 bad Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -172,12 +172,12 @@ stop_nc_server()
fi
}
-BASIC_LIBS="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif -lrumpdev"
-FS_LIBS="$BASIC_LIBS -lrumpvfs -lrumpfs_ffs"
-CRYPTO_LIBS="$BASIC_LIBS -lrumpvfs -lrumpdev_opencrypto \
+BASIC_LIBS="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+FS_LIBS="$BASIC_LIBS -lrumpdev -lrumpvfs -lrumpfs_ffs"
+CRYPTO_LIBS="$BASIC_LIBS -lrumpdev -lrumpdev_opencrypto \
-lrumpkern_z -lrumpkern_crypto"
-NPF_LIBS="$BASIC_LIBS -lrumpvfs -lrumpdev_bpf -lrumpnet_npf"
-CRYPTO_NPF_LIBS="$CRYPTO_LIBS -lrumpdev_bpf -lrumpnet_npf"
+NPF_LIBS="$BASIC_LIBS -lrumpdev -lrumpvfs -lrumpdev_bpf -lrumpnet_npf"
+CRYPTO_NPF_LIBS="$CRYPTO_LIBS -lrumpvfs -lrumpdev_bpf -lrumpnet_npf"
# We cannot keep variables between test phases, so need to store in files
_rump_server_socks=./.__socks
Index: src/tests/net/arp/t_arp.sh
diff -u src/tests/net/arp/t_arp.sh:1.36 src/tests/net/arp/t_arp.sh:1.37
--- src/tests/net/arp/t_arp.sh:1.36 Fri Apr 6 09:23:36 2018
+++ src/tests/net/arp/t_arp.sh Mon May 13 17:55:08 2019
@@ -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 @@ test_proxy_arp()
local type=$1
rump_server_start $SOCKSRC
- rump_server_start $SOCKDST tap
+ rump_server_fs_start $SOCKDST tap
setup_dst_server
setup_src_server
Index: src/tests/net/bpfjit/Makefile
diff -u src/tests/net/bpfjit/Makefile:1.6 src/tests/net/bpfjit/Makefile:1.7
--- src/tests/net/bpfjit/Makefile:1.6 Mon Aug 8 15:01:59 2016
+++ src/tests/net/bpfjit/Makefile Mon May 13 17:55:08 2019
@@ -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 @@ PAXCTL_FLAGS= +m
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>
Index: src/tests/net/icmp/Makefile
diff -u src/tests/net/icmp/Makefile:1.9 src/tests/net/icmp/Makefile:1.10
--- src/tests/net/icmp/Makefile:1.9 Thu Nov 24 09:06:09 2016
+++ src/tests/net/icmp/Makefile Mon May 13 17:55:08 2019
@@ -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 @@ TESTS_SH_SRC_t_${name}= ../net_common.sh
.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>
Index: src/tests/net/icmp/t_ping2.sh
diff -u src/tests/net/icmp/t_ping2.sh:1.5 src/tests/net/icmp/t_ping2.sh:1.6
--- src/tests/net/icmp/t_ping2.sh:1.5 Wed Aug 10 22:17:44 2016
+++ src/tests/net/icmp/t_ping2.sh Mon May 13 17:55:08 2019
@@ -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()
Index: src/tests/net/if/Makefile
diff -u src/tests/net/if/Makefile:1.7 src/tests/net/if/Makefile:1.8
--- src/tests/net/if/Makefile:1.7 Tue Feb 14 08:43:06 2017
+++ src/tests/net/if/Makefile Mon May 13 17:55:08 2019
@@ -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 @@ MAN.ifconf= # empty
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>
Index: src/tests/net/if/t_ifconf.sh
diff -u src/tests/net/if/t_ifconf.sh:1.3 src/tests/net/if/t_ifconf.sh:1.4
--- src/tests/net/if/t_ifconf.sh:1.3 Wed Aug 10 22:30:02 2016
+++ src/tests/net/if/t_ifconf.sh Mon May 13 17:55:08 2019
@@ -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()
Index: src/tests/net/if/t_ifconfig.sh
diff -u src/tests/net/if/t_ifconfig.sh:1.18 src/tests/net/if/t_ifconfig.sh:1.19
--- src/tests/net/if/t_ifconfig.sh:1.18 Thu Mar 16 09:43:56 2017
+++ src/tests/net/if/t_ifconfig.sh Mon May 13 17:55:08 2019
@@ -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_SERVER2=unix://./r2
RUMP_FLAGS=\
"-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_shmif"
-RUMP_FLAGS="${RUMP_FLAGS} -lrumpdev"
+RUMP_FLAGS="${RUMP_FLAGS}"
TIMEOUT=3
Index: src/tests/net/if_loop/Makefile
diff -u src/tests/net/if_loop/Makefile:1.4 src/tests/net/if_loop/Makefile:1.5
--- src/tests/net/if_loop/Makefile:1.4 Tue Feb 28 03:32:11 2017
+++ src/tests/net/if_loop/Makefile Mon May 13 17:55:08 2019
@@ -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 @@ TESTSDIR= ${TESTSBASE}/net/if_loop
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}
Index: src/tests/net/if_tap/t_tap.sh
diff -u src/tests/net/if_tap/t_tap.sh:1.8 src/tests/net/if_tap/t_tap.sh:1.9
--- src/tests/net/if_tap/t_tap.sh:1.8 Thu Mar 22 09:21:24 2018
+++ src/tests/net/if_tap/t_tap.sh Mon May 13 17:55:08 2019
@@ -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_head()
tap_create_destroy_body()
{
- rump_server_start $SOCK_LOCAL netinet6 tap
+ rump_server_fs_start $SOCK_LOCAL netinet6 tap
test_create_destroy_common $SOCK_LOCAL tap0 true
}
@@ -72,8 +72,8 @@ tap_create_destroy_head()
tap_stand_alone_body()
{
- rump_server_start $SOCK_LOCAL netinet6 tap
- rump_server_start $SOCK_REMOTE netinet6 tap
+ rump_server_fs_start $SOCK_LOCAL netinet6 tap
+ rump_server_fs_start $SOCK_REMOTE netinet6 tap
rump_server_add_iface $SOCK_LOCAL shmif0 $BUS
rump_server_add_iface $SOCK_REMOTE shmif0 $BUS
@@ -131,8 +131,8 @@ tap_bridged_head()
tap_bridged_body()
{
- rump_server_start $SOCK_LOCAL netinet6 tap bridge
- rump_server_start $SOCK_REMOTE netinet6 tap
+ rump_server_fs_start $SOCK_LOCAL netinet6 tap bridge
+ rump_server_fs_start $SOCK_REMOTE netinet6 tap
rump_server_add_iface $SOCK_LOCAL shmif0 $BUS
rump_server_add_iface $SOCK_REMOTE shmif0 $BUS
Index: src/tests/net/if_tun/t_tun.sh
diff -u src/tests/net/if_tun/t_tun.sh:1.5 src/tests/net/if_tun/t_tun.sh:1.6
--- src/tests/net/if_tun/t_tun.sh:1.5 Thu Feb 1 05:22:02 2018
+++ src/tests/net/if_tun/t_tun.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_tun.sh,v 1.5 2018/02/01 05:22:02 ozaki-r Exp $
+# $NetBSD: t_tun.sh,v 1.6 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
#
RUMP_FLAGS="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6"
-RUMP_FLAGS="$RUMP_FLAGS -lrumpnet_shmif -lrumpnet_tun -lrumpdev"
+RUMP_FLAGS="$RUMP_FLAGS -lrumpnet_shmif -lrumpnet_tun"
BUS=bus
SOCK_LOCAL=unix://commsock1
Index: src/tests/net/mpls/t_ldp_regen.sh
diff -u src/tests/net/mpls/t_ldp_regen.sh:1.7 src/tests/net/mpls/t_ldp_regen.sh:1.8
--- src/tests/net/mpls/t_ldp_regen.sh:1.7 Wed Aug 10 07:50:37 2016
+++ src/tests/net/mpls/t_ldp_regen.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ldp_regen.sh,v 1.7 2016/08/10 07:50:37 ozaki-r Exp $
+# $NetBSD: t_ldp_regen.sh,v 1.8 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -42,7 +42,7 @@ RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
RUMP_LIBS="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \
- -lrumpdev -lrumpnet_netmpls -lrumpnet_shmif"
+ -lrumpnet_netmpls -lrumpnet_shmif"
LDP_FLAGS=""
atf_test_case ldp_regen cleanup
Index: src/tests/net/mpls/t_mpls_fw.sh
diff -u src/tests/net/mpls/t_mpls_fw.sh:1.5 src/tests/net/mpls/t_mpls_fw.sh:1.6
--- src/tests/net/mpls/t_mpls_fw.sh:1.5 Wed Aug 10 07:50:37 2016
+++ src/tests/net/mpls/t_mpls_fw.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_mpls_fw.sh,v 1.5 2016/08/10 07:50:37 ozaki-r Exp $
+# $NetBSD: t_mpls_fw.sh,v 1.6 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -43,7 +43,7 @@ RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
RUMP_FLAGS="-lrumpnet -lrumpnet_net -lrumpnet_netinet \
- -lrumpdev -lrumpnet_netmpls -lrumpnet_shmif"
+ -lrumpnet_netmpls -lrumpnet_shmif"
atf_test_case mplsfw4 cleanup
mplsfw4_head()
Index: src/tests/net/mpls/t_mpls_fw6.sh
diff -u src/tests/net/mpls/t_mpls_fw6.sh:1.3 src/tests/net/mpls/t_mpls_fw6.sh:1.4
--- src/tests/net/mpls/t_mpls_fw6.sh:1.3 Wed Aug 10 07:50:37 2016
+++ src/tests/net/mpls/t_mpls_fw6.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_mpls_fw6.sh,v 1.3 2016/08/10 07:50:37 ozaki-r Exp $
+# $NetBSD: t_mpls_fw6.sh,v 1.4 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -44,7 +44,7 @@ RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
RUMP_FLAGS6="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \
- -lrumpdev -lrumpnet_shmif -lrumpnet_netmpls"
+ -lrumpnet_shmif -lrumpnet_netmpls"
atf_test_case mplsfw6 cleanup
mplsfw6_head()
Index: src/tests/net/mpls/t_mpls_fw64.sh
diff -u src/tests/net/mpls/t_mpls_fw64.sh:1.3 src/tests/net/mpls/t_mpls_fw64.sh:1.4
--- src/tests/net/mpls/t_mpls_fw64.sh:1.3 Wed Aug 10 07:50:37 2016
+++ src/tests/net/mpls/t_mpls_fw64.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_mpls_fw64.sh,v 1.3 2016/08/10 07:50:37 ozaki-r Exp $
+# $NetBSD: t_mpls_fw64.sh,v 1.4 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -48,7 +48,7 @@ RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
RUMP_FLAGS6="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \
- -lrumpdev -lrumpnet_shmif -lrumpnet_netmpls"
+ -lrumpnet_shmif -lrumpnet_netmpls"
startservers()
{
Index: src/tests/net/mpls/t_rfc4182.sh
diff -u src/tests/net/mpls/t_rfc4182.sh:1.4 src/tests/net/mpls/t_rfc4182.sh:1.5
--- src/tests/net/mpls/t_rfc4182.sh:1.4 Wed Aug 10 07:50:37 2016
+++ src/tests/net/mpls/t_rfc4182.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_rfc4182.sh,v 1.4 2016/08/10 07:50:37 ozaki-r Exp $
+# $NetBSD: t_rfc4182.sh,v 1.5 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -45,7 +45,7 @@ RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
RUMP_FLAGS="-lrumpnet -lrumpnet_net -lrumpnet_netinet \
- -lrumpdev -lrumpnet_netmpls -lrumpnet_shmif"
+ -lrumpnet_netmpls -lrumpnet_shmif"
atf_test_case rfc4182 cleanup
rfc4182_head()
Index: src/tests/net/net/Makefile
diff -u src/tests/net/net/Makefile:1.21 src/tests/net/net/Makefile:1.22
--- src/tests/net/net/Makefile:1.21 Thu Aug 10 04:31:58 2017
+++ src/tests/net/net/Makefile Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/08/10 04:31:58 ryo Exp $
+# $NetBSD: Makefile,v 1.22 2019/05/13 17:55:09 bad Exp $
#
.include <bsd.own.mk>
@@ -21,9 +21,9 @@ TESTS_SH_SRC_t_${name}= ../net_common.sh
.endif
LDADD.t_pktinfo_send+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net
-LDADD.t_pktinfo_send+= -lrumpdev -lrumpnet_shmif -lrumpnet
+LDADD.t_pktinfo_send+= -lrumpnet_shmif -lrumpnet
LDADD.t_pktinfo_send+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
-LDADD.t_raw+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net -lrumpdev
+LDADD.t_raw+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net
LDADD.t_raw+= -lrumpnet -lrumpvfs -lrump -lrumpuser -lrump -lpthread
.include <bsd.test.mk>
Index: src/tests/net/net/t_ipv6address.sh
diff -u src/tests/net/net/t_ipv6address.sh:1.14 src/tests/net/net/t_ipv6address.sh:1.15
--- src/tests/net/net/t_ipv6address.sh:1.14 Wed Jun 21 09:05:31 2017
+++ src/tests/net/net/t_ipv6address.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipv6address.sh,v 1.14 2017/06/21 09:05:31 ozaki-r Exp $
+# $NetBSD: t_ipv6address.sh,v 1.15 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@@ -25,7 +25,7 @@
# POSSIBILITY OF SUCH DAMAGE.
SERVER="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
-SERVER="${SERVER} -lrumpnet_shmif -lrumpdev"
+SERVER="${SERVER} -lrumpnet_shmif"
SERVER6="${SERVER} -lrumpnet_netinet6"
SOCKSRC=unix://commsock1
Index: src/tests/net/route/t_change.sh
diff -u src/tests/net/route/t_change.sh:1.13 src/tests/net/route/t_change.sh:1.14
--- src/tests/net/route/t_change.sh:1.13 Thu Apr 18 07:56:54 2019
+++ src/tests/net/route/t_change.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_change.sh,v 1.13 2019/04/18 07:56:54 ozaki-r Exp $
+# $NetBSD: t_change.sh,v 1.14 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,8 +26,7 @@
#
netserver=\
-"rump_server -lrumpdev -lrumpnet -lrumpnet_net \
- -lrumpnet_netinet -lrumpnet_shmif"
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
export RUMP_SERVER=unix://commsock
DEBUG=${DEBUG:-false}
Index: src/tests/rump/rumpkern/t_sp.sh
diff -u src/tests/rump/rumpkern/t_sp.sh:1.13 src/tests/rump/rumpkern/t_sp.sh:1.14
--- src/tests/rump/rumpkern/t_sp.sh:1.13 Wed Aug 10 23:47:14 2016
+++ src/tests/rump/rumpkern/t_sp.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_sp.sh,v 1.13 2016/08/10 23:47:14 kre Exp $
+# $NetBSD: t_sp.sh,v 1.14 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -73,7 +73,7 @@ stress()
export RUMP_SERVER=unix://commsock
atf_check -s exit:0 rump_server \
- -lrumpvfs -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpdev \
+ -lrumpvfs -lrumpnet -lrumpnet_net -lrumpnet_netinet \
${RUMP_SERVER}
atf_check -s exit:0 -e ignore $(atf_get_srcdir)/h_client/h_stresscli $@
}
@@ -82,7 +82,7 @@ fork()
{
export RUMP_SERVER=unix://commsock
- atf_check -s exit:0 rump_server -lrumpvfs -lrumpdev ${RUMP_SERVER}
+ atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER}
atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_forkcli ${1}
}
Index: src/tests/rump/rumpnet/t_shmif.sh
diff -u src/tests/rump/rumpnet/t_shmif.sh:1.3 src/tests/rump/rumpnet/t_shmif.sh:1.4
--- src/tests/rump/rumpnet/t_shmif.sh:1.3 Wed Aug 10 23:49:03 2016
+++ src/tests/rump/rumpnet/t_shmif.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_shmif.sh,v 1.3 2016/08/10 23:49:03 kre Exp $
+# $NetBSD: t_shmif.sh,v 1.4 2019/05/13 17:55:09 bad Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,7 +39,7 @@ startserver()
export RUMP_SERVER=unix://sock${1}
atf_check -s exit:0 rump_server -lrumpnet -lrumpnet_net \
- -lrumpnet_netinet -lrumpnet_shmif -lrumpdev ${RUMP_SERVER}
+ -lrumpnet_netinet -lrumpnet_shmif ${RUMP_SERVER}
atf_check -s exit:0 rump.ifconfig shmif0 create
atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus
atf_check -s exit:0 rump.ifconfig shmif0 inet 1.1.1.${1}
Index: src/tests/usr.sbin/traceroute/t_traceroute.sh
diff -u src/tests/usr.sbin/traceroute/t_traceroute.sh:1.6 src/tests/usr.sbin/traceroute/t_traceroute.sh:1.7
--- src/tests/usr.sbin/traceroute/t_traceroute.sh:1.6 Wed Aug 10 23:17:35 2016
+++ src/tests/usr.sbin/traceroute/t_traceroute.sh Mon May 13 17:55:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_traceroute.sh,v 1.6 2016/08/10 23:17:35 kre Exp $
+# $NetBSD: t_traceroute.sh,v 1.7 2019/05/13 17:55:09 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()
Index: src/usr.sbin/npf/npftest/Makefile
diff -u src/usr.sbin/npf/npftest/Makefile:1.11 src/usr.sbin/npf/npftest/Makefile:1.12
--- src/usr.sbin/npf/npftest/Makefile:1.11 Sat Sep 29 14:41:36 2018
+++ src/usr.sbin/npf/npftest/Makefile Mon May 13 17:55:09 2019
@@ -19,7 +19,6 @@ LDADD+= -L${LIBNPFTEST} -lnpftest
LDADD+= -lrump -lrumpvfs -lrumpuser -lrumpnet -lrumpnet_net
LDADD+= -lrumpdev_bpf
-LDADD+= -lrumpdev
.include <bsd.own.mk>
