Module Name: src
Committed By: ozaki-r
Date: Tue Aug 20 08:20:20 UTC 2024
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/net: Makefile
Added Files:
src/tests/net/if_shmif: Makefile t_shmif.sh
Log Message:
tests: add tests for shmif
The test file is placed under tests/net, not tests/rump/rumpnet,
to leverage utility functions provided for tests in there.
To generate a diff of this commit:
cvs rdiff -u -r1.1332 -r1.1333 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.205 -r1.206 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.41 -r1.42 src/tests/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/if_shmif/Makefile \
src/tests/net/if_shmif/t_shmif.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1332 src/distrib/sets/lists/tests/mi:1.1333
--- src/distrib/sets/lists/tests/mi:1.1332 Thu Aug 15 21:19:45 2024
+++ src/distrib/sets/lists/tests/mi Tue Aug 20 08:20:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1332 2024/08/15 21:19:45 riastradh Exp $
+# $NetBSD: mi,v 1.1333 2024/08/20 08:20:19 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4337,6 +4337,10 @@
./usr/tests/net/if_pppoe/Kyuafile tests-net-tests atf,rump,kyua
./usr/tests/net/if_pppoe/t_pppoe tests-net-tests atf,rump
./usr/tests/net/if_pppoe/t_pppoe_unnumbered tests-net-tests atf,rump
+./usr/tests/net/if_shmif tests-net-tests compattestfile,atf
+./usr/tests/net/if_shmif/Atffile tests-net-tests atf,rump
+./usr/tests/net/if_shmif/Kyuafile tests-net-tests atf,rump,kyua
+./usr/tests/net/if_shmif/t_shmif tests-net-tests atf,rump
./usr/tests/net/if_tap tests-net-tests compattestfile,atf
./usr/tests/net/if_tap/Atffile tests-net-tests atf,rump
./usr/tests/net/if_tap/Kyuafile tests-net-tests atf,rump,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.205 src/etc/mtree/NetBSD.dist.tests:1.206
--- src/etc/mtree/NetBSD.dist.tests:1.205 Sun Apr 28 14:39:22 2024
+++ src/etc/mtree/NetBSD.dist.tests Tue Aug 20 08:20:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.205 2024/04/28 14:39:22 rillig Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.206 2024/08/20 08:20:19 ozaki-r Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -381,6 +381,7 @@
./usr/tests/net/if_lagg
./usr/tests/net/if_loop
./usr/tests/net/if_pppoe
+./usr/tests/net/if_shmif
./usr/tests/net/if_tap
./usr/tests/net/if_tun
./usr/tests/net/if_vether
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.41 src/tests/net/Makefile:1.42
--- src/tests/net/Makefile:1.41 Thu Nov 17 08:45:35 2022
+++ src/tests/net/Makefile Tue Aug 20 08:20:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2022/11/17 08:45:35 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.42 2024/08/20 08:20:19 ozaki-r Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@ TESTSDIR= ${TESTSBASE}/net
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_ipsec if_l2tp if_lagg if_loop if_pppoe if_shmif if_tap
TESTS_SUBDIRS+= if_tun if_vether if_vlan if_wg inpcb ipsec mcast mpls
TESTS_SUBDIRS+= ndp npf route tcp
.if (${MKSLJIT} != "no")
Added files:
Index: src/tests/net/if_shmif/Makefile
diff -u /dev/null src/tests/net/if_shmif/Makefile:1.1
--- /dev/null Tue Aug 20 08:20:20 2024
+++ src/tests/net/if_shmif/Makefile Tue Aug 20 08:20:19 2024
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2024/08/20 08:20:19 ozaki-r Exp $
+#
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/net/if_shmif
+
+.for name in shmif
+TESTS_SH+= t_${name}
+TESTS_SH_SRC_t_${name}= ../net_common.sh t_${name}.sh
+.endfor
+
+.include <bsd.test.mk>
Index: src/tests/net/if_shmif/t_shmif.sh
diff -u /dev/null src/tests/net/if_shmif/t_shmif.sh:1.1
--- /dev/null Tue Aug 20 08:20:20 2024
+++ src/tests/net/if_shmif/t_shmif.sh Tue Aug 20 08:20:19 2024
@@ -0,0 +1,138 @@
+# $NetBSD: t_shmif.sh,v 1.1 2024/08/20 08:20:19 ozaki-r Exp $
+#
+# Copyright (c) 2024 Internet Initiative Japan Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+RUMP_SERVER1=unix://./r1
+RUMP_SERVER2=unix://./r2
+
+TIMEOUT=3
+
+atf_test_case shmif_linkstate cleanup
+shmif_linkstate_head()
+{
+ atf_set "descr" "tests of ifconfig media on shmif"
+ atf_set "require.progs" "rump_server"
+}
+
+shmif_linkstate_body()
+{
+ local auto="Ethernet autoselect"
+ local none="Ethernet none"
+
+ rump_server_start $RUMP_SERVER1
+ rump_server_add_iface $RUMP_SERVER1 shmif0 bus1
+
+ export RUMP_SERVER=$RUMP_SERVER1
+ # After ifconfig linkstr, the state becomes UP
+ atf_check -o match:'linkstate: up' \
+ -o match:"media: $auto" \
+ -o not-match:"<UP" rump.ifconfig -v shmif0
+ atf_check rump.ifconfig shmif0 up
+ atf_check -o match:'linkstate: up' \
+ -o match:"media: $auto" \
+ -o match:"<UP" rump.ifconfig -v shmif0
+ # ifconfig media none makes the state DOWN
+ atf_check rump.ifconfig shmif0 media none
+ atf_check -o match:'linkstate: down' \
+ -o match:"media: $none" \
+ -o match:"<UP" rump.ifconfig -v shmif0
+ # ifconfig media auto makes the state UP
+ atf_check rump.ifconfig shmif0 media auto
+ atf_check -o match:'linkstate: up' \
+ -o match:"media: $auto" \
+ -o match:"<UP" rump.ifconfig -v shmif0
+ atf_check rump.ifconfig shmif0 down
+ atf_check -o match:'linkstate: up' \
+ -o match:"media: $auto" \
+ -o not-match:"<UP" rump.ifconfig -v shmif0
+ # After ifconfig -linkstr, the state becomes UNKNOWN
+ atf_check rump.ifconfig shmif0 -linkstr
+ atf_check -o match:'linkstate: unknown' \
+ -o match:"media: $auto" \
+ -o not-match:"<UP" rump.ifconfig -v shmif0
+
+ rump_server_destroy_ifaces
+}
+
+shmif_linkstate_cleanup()
+{
+
+ $DEBUG && dump
+ cleanup
+}
+
+atf_test_case shmif_linkstate_down cleanup
+shmif_linkstate_down_head()
+{
+ atf_set "descr" "tests of behaviors of down shmif"
+ atf_set "require.progs" "rump_server"
+}
+
+shmif_linkstate_down_body()
+{
+
+ rump_server_start $RUMP_SERVER1
+ rump_server_start $RUMP_SERVER2
+ rump_server_add_iface $RUMP_SERVER1 shmif0 bus1
+ rump_server_add_iface $RUMP_SERVER2 shmif0 bus1
+
+ export RUMP_SERVER=$RUMP_SERVER1
+ atf_check rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check rump.ifconfig shmif0 10.0.0.1/24 up
+ export RUMP_SERVER=$RUMP_SERVER2
+ atf_check rump.sysctl -q -w net.inet.ip.dad_count=0
+ atf_check rump.ifconfig shmif0 10.0.0.2/24 up
+
+ export RUMP_SERVER=$RUMP_SERVER1
+ atf_check -o ignore rump.ping -c 1 -w $TIMEOUT 10.0.0.2
+
+ atf_check rump.ifconfig shmif0 media none
+ atf_check -o match:'linkstate: down' rump.ifconfig -v shmif0
+
+ # shmif doesn't send any packets on link down
+ atf_check -s not-exit:0 -o ignore rump.ping -c 1 -w $TIMEOUT 10.0.0.2
+
+ atf_check rump.ifconfig shmif0 media auto
+ atf_check -o match:'linkstate: up' rump.ifconfig -v shmif0
+
+ atf_check -o ignore rump.ping -c 1 -w $TIMEOUT 10.0.0.2
+
+ rump_server_destroy_ifaces
+}
+
+shmif_linkstate_down_cleanup()
+{
+
+ $DEBUG && dump
+ cleanup
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case shmif_linkstate
+ atf_add_test_case shmif_linkstate_down
+}
