diff --git a/distrib/sets/lists/debug/mi b/distrib/sets/lists/debug/mi index 4b94fc29a6dc..5df421934149 100644 --- a/distrib/sets/lists/debug/mi +++ b/distrib/sets/lists/debug/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.390 2022/11/04 08:01:42 ozaki-r Exp $ +# $NetBSD: mi,v 1.391 2022/11/17 08:45:35 ozaki-r Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2421,6 +2421,8 @@ ./usr/libdata/debug/usr/tests/net/if_tap/rump_open_tap.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/if_vlan/bpfopen.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/if_vlan/siocXmulti.debug tests-net-debug debug,atf,rump +./usr/libdata/debug/usr/tests/net/inpcb/broadcast_bind.debug tests-net-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/net/inpcb/inpcb_bind.debug tests-net-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/net/in_cksum/in_cksum.debug tests-net-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/net/ipsec/natt_terminator.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/mcast/mcast.debug tests-net-debug debug,atf,rump @@ -2430,6 +2432,7 @@ ./usr/libdata/debug/usr/tests/net/net/t_pktinfo.debug tests-net-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/net/net/t_pktinfo_send.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/net/t_raw.debug tests-net-debug debug,atf,rump +./usr/libdata/debug/usr/tests/net/net/t_socket_afinet.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/net/t_tcp.debug tests-net-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/net/net/t_udp.debug tests-net-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/net/net/t_unix.debug tests-net-debug debug,atf,compattestfile @@ -2438,6 +2441,7 @@ ./usr/libdata/debug/usr/tests/net/sys/t_rfc6056.debug tests-net-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/net/sys/t_socketpair.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/net/tcp/tcp_shutdown.debug tests-net-debug debug,atf,rump +./usr/libdata/debug/usr/tests/net/tcp/t_tcp_connect_port.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/rump/modautoload/t_modautoload.debug tests-syscall-debug debug,atf,rump ./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_forkcli.debug tests-syscall-debug debug,atf,rump ./usr/libdata/debug/usr/tests/rump/rumpkern/h_client/h_reboot.debug tests-obsolete obsolete diff --git a/distrib/sets/lists/tests/mi b/distrib/sets/lists/tests/mi index 0bf1eabfc74a..81a96fd4903a 100644 --- a/distrib/sets/lists/tests/mi +++ b/distrib/sets/lists/tests/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1231 2022/11/17 06:40:38 chs Exp $ +# $NetBSD: mi,v 1.1232 2022/11/17 08:45:35 ozaki-r Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -4204,6 +4204,13 @@ ./usr/tests/net/if_wg/t_interoperability tests-net-tests atf,rump ./usr/tests/net/if_wg/t_misc tests-net-tests atf,rump ./usr/tests/net/if_wg/t_tunnel tests-net-tests atf,rump +./usr/tests/net/inpcb tests-net-tests compattestfile,atf +./usr/tests/net/inpcb/Atffile tests-net-tests atf,rump +./usr/tests/net/inpcb/Kyuafile tests-net-tests atf,rump,kyua +./usr/tests/net/inpcb/broadcast_bind tests-net-tests atf,rump +./usr/tests/net/inpcb/inpcb_bind tests-net-tests atf,rump +./usr/tests/net/inpcb/t_broadcast_bind tests-net-tests atf,rump +./usr/tests/net/inpcb/t_inpcb_bind tests-net-tests atf,rump ./usr/tests/net/in_cksum tests-net-tests compattestfile,atf ./usr/tests/net/in_cksum/Atffile tests-net-tests compattestfile,atf ./usr/tests/net/in_cksum/Kyuafile tests-net-tests compattestfile,atf,kyua @@ -4264,6 +4271,7 @@ ./usr/tests/net/net/t_pktinfo tests-net-tests compattestfile,atf ./usr/tests/net/net/t_pktinfo_send tests-net-tests atf,rump ./usr/tests/net/net/t_raw tests-net-tests atf,rump +./usr/tests/net/net/t_socket_afinet tests-net-tests compattestfile,atf ./usr/tests/net/net/t_tcp tests-net-tests compattestfile,atf ./usr/tests/net/net/t_udp tests-net-tests compattestfile,atf ./usr/tests/net/net/t_unix tests-net-tests compattestfile,atf @@ -4291,6 +4299,7 @@ ./usr/tests/net/tcp/Atffile tests-net-tests atf,rump ./usr/tests/net/tcp/Kyuafile tests-net-tests atf,rump,kyua ./usr/tests/net/tcp/tcp_shutdown tests-net-tests atf,rump +./usr/tests/net/tcp/t_tcp_connect_port tests-net-tests atf,rump ./usr/tests/net/tcp/t_tcp_nc tests-net-tests atf,rump ./usr/tests/net/tcp/t_tcp_shutdown tests-net-tests atf,rump ./usr/tests/net/wireguard tests-obsolete obsolete diff --git a/etc/mtree/NetBSD.dist.tests b/etc/mtree/NetBSD.dist.tests index 25e7dc3673c5..873b34388e7a 100644 --- a/etc/mtree/NetBSD.dist.tests +++ b/etc/mtree/NetBSD.dist.tests @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.195 2022/11/04 08:01:42 ozaki-r Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.196 2022/11/17 08:45:35 ozaki-r Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -153,6 +153,7 @@ ./usr/libdata/debug/usr/tests/net/if_tap ./usr/libdata/debug/usr/tests/net/if_vether ./usr/libdata/debug/usr/tests/net/if_vlan +./usr/libdata/debug/usr/tests/net/inpcb ./usr/libdata/debug/usr/tests/net/in_cksum ./usr/libdata/debug/usr/tests/net/ipsec ./usr/libdata/debug/usr/tests/net/mcast @@ -374,6 +375,7 @@ ./usr/tests/net/if_vether ./usr/tests/net/if_vlan ./usr/tests/net/if_wg +./usr/tests/net/inpcb ./usr/tests/net/in_cksum ./usr/tests/net/ipsec ./usr/tests/net/mcast diff --git a/tests/net/Makefile b/tests/net/Makefile index d7e9ab6f72b6..8cb9ff39002b 100644 --- a/tests/net/Makefile +++ b/tests/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2022/11/02 09:37:56 ozaki-r Exp $ +# $NetBSD: Makefile,v 1.41 2022/11/17 08:45:35 ozaki-r Exp $ .include @@ -8,7 +8,7 @@ TESTS_SUBDIRS= fdpass in_cksum net sys .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE) TESTS_SUBDIRS+= altq arp bpf bpfilter can carp icmp if if_bridge if_gif TESTS_SUBDIRS+= if_ipsec if_l2tp if_lagg if_loop if_pppoe if_tap -TESTS_SUBDIRS+= if_tun if_vether if_vlan if_wg ipsec mcast mpls +TESTS_SUBDIRS+= if_tun if_vether if_vlan if_wg inpcb ipsec mcast mpls TESTS_SUBDIRS+= ndp npf route tcp .if (${MKSLJIT} != "no") TESTS_SUBDIRS+= bpfjit diff --git a/tests/net/inpcb/Makefile b/tests/net/inpcb/Makefile new file mode 100644 index 000000000000..9181c9e012ef --- /dev/null +++ b/tests/net/inpcb/Makefile @@ -0,0 +1,21 @@ +# $NetBSD: Makefile,v 1.1 2022/11/17 08:45:35 ozaki-r Exp $ +# + +.include + +TESTSDIR= ${TESTSBASE}/net/inpcb + +.for name in inpcb_bind broadcast_bind +TESTS_SH+= t_${name} +TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh +.endfor + +PROGS= inpcb_bind +MAN.inpcb_bind= # empty +BINDIR.inpcb_bind= ${TESTSDIR} + +PROGS+= broadcast_bind +MAN.broadcast_bind= # empty +BINDIR.broadcast_bind= ${TESTSDIR} + +.include diff --git a/tests/net/net/Makefile b/tests/net/net/Makefile index d6bf4261bd28..06eba3012819 100644 --- a/tests/net/net/Makefile +++ b/tests/net/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2020/09/08 14:13:50 christos Exp $ +# $NetBSD: Makefile,v 1.26 2022/11/17 08:45:36 ozaki-r Exp $ # .include @@ -11,6 +11,7 @@ TESTS_C+= t_mapped TESTS_C+= t_tcp TESTS_C+= t_udp TESTS_C+= t_pktinfo +TESTS_C+= t_socket_afinet .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE) TESTS_C+= t_pktinfo_send TESTS_C+= t_raw @@ -27,6 +28,8 @@ LDADD.t_pktinfo_send+= -lrumpnet_shmif -lrumpnet LDADD.t_pktinfo_send+= ${LIBRUMPBASE} LDADD.t_raw+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net LDADD.t_raw+= -lrumpnet ${LIBRUMPBASE} +LDADD.t_socket_afinet+= -lrumpdev_bpf -lrumpdev -lrumpnet_netinet -lrumpnet_net +LDADD.t_socket_afinet+= -lrumpnet_local -lrumpnet ${LIBRUMPBASE} LDADD.t_mapped+= -lutil diff --git a/tests/net/tcp/Makefile b/tests/net/tcp/Makefile index 81feefd73c82..87d22aa992ee 100644 --- a/tests/net/tcp/Makefile +++ b/tests/net/tcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2022/11/04 08:01:42 ozaki-r Exp $ +# $NetBSD: Makefile,v 1.3 2022/11/17 08:45:36 ozaki-r Exp $ # .include @@ -14,4 +14,9 @@ PROGS= tcp_shutdown MAN.tcp_shutdown= # empty BINDIR.tcp_shutdown= ${TESTSDIR} +TESTS_C= t_tcp_connect_port + +LDADD.t_tcp_connect_port+= -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_net +LDADD.t_tcp_connect_port+= -lrumpnet_local -lrumpnet ${LIBRUMPBASE} + .include