Module Name: src
Committed By: ozaki-r
Date: Thu Nov 24 09:07:10 UTC 2016
Modified Files:
src/tests/net: net_common.sh
src/tests/net/arp: t_arp.sh
src/tests/net/if_bridge: Makefile t_bridge.sh
src/tests/net/net: t_ping6_opts.sh
Log Message:
Move get_macaddr to net_common.sh
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/net/net_common.sh
cvs rdiff -u -r1.20 -r1.21 src/tests/net/arp/t_arp.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_bridge/Makefile
cvs rdiff -u -r1.13 -r1.14 src/tests/net/if_bridge/t_bridge.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/net/net/t_ping6_opts.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/net_common.sh
diff -u src/tests/net/net_common.sh:1.4 src/tests/net/net_common.sh:1.5
--- src/tests/net/net_common.sh:1.4 Thu Nov 24 09:06:09 2016
+++ src/tests/net/net_common.sh Thu Nov 24 09:07:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: net_common.sh,v 1.4 2016/11/24 09:06:09 ozaki-r Exp $
+# $NetBSD: net_common.sh,v 1.5 2016/11/24 09:07:09 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -96,3 +96,10 @@ get_linklocal_addr()
return 0
}
+
+get_macaddr()
+{
+
+ env RUMP_SERVER=${1} \
+ rump.ifconfig ${2} |awk '/address/ {print $2;}'
+}
Index: src/tests/net/arp/t_arp.sh
diff -u src/tests/net/arp/t_arp.sh:1.20 src/tests/net/arp/t_arp.sh:1.21
--- src/tests/net/arp/t_arp.sh:1.20 Thu Nov 24 09:03:53 2016
+++ src/tests/net/arp/t_arp.sh Thu Nov 24 09:07:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_arp.sh,v 1.20 2016/11/24 09:03:53 ozaki-r Exp $
+# $NetBSD: t_arp.sh,v 1.21 2016/11/24 09:07:09 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -376,7 +376,7 @@ test_proxy_arp()
export RUMP_SERVER=$SOCKDST
atf_check -s exit:0 -o ignore rump.sysctl -w net.inet.ip.forwarding=1
- macaddr_dst=$(rump.ifconfig shmif0 |awk '/address/ {print $2;}')
+ macaddr_dst=$(get_macaddr $SOCKDST shmif0)
if [ "$type" = "pub" ]; then
opts="pub"
@@ -523,8 +523,7 @@ arp_static_body()
setup_dst_server
setup_src_server $arp_keep
- export RUMP_SERVER=$SOCKSRC
- macaddr_src=$(rump.ifconfig shmif0 |awk '/address/ {print $2;}')
+ macaddr_src=$(get_macaddr $SOCKSRC shmif0)
# Set a (valid) static ARP entry for the src server
export RUMP_SERVER=$SOCKDST
Index: src/tests/net/if_bridge/Makefile
diff -u src/tests/net/if_bridge/Makefile:1.1 src/tests/net/if_bridge/Makefile:1.2
--- src/tests/net/if_bridge/Makefile:1.1 Thu Sep 18 15:13:27 2014
+++ src/tests/net/if_bridge/Makefile Thu Nov 24 09:07:09 2016
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2014/09/18 15:13:27 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.2 2016/11/24 09:07:09 ozaki-r Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net/if_bridge
-TESTS_SH= t_bridge
+.for name in bridge
+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_bridge/t_bridge.sh
diff -u src/tests/net/if_bridge/t_bridge.sh:1.13 src/tests/net/if_bridge/t_bridge.sh:1.14
--- src/tests/net/if_bridge/t_bridge.sh:1.13 Wed Aug 10 22:37:07 2016
+++ src/tests/net/if_bridge/t_bridge.sh Thu Nov 24 09:07:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_bridge.sh,v 1.13 2016/08/10 22:37:07 kre Exp $
+# $NetBSD: t_bridge.sh,v 1.14 2016/11/24 09:07:09 ozaki-r Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -360,11 +360,8 @@ test_brconfig_maxaddr()
addr1= addr3= n=
# Get MAC addresses of the endpoints.
- export RUMP_SERVER=$SOCK1
- addr1=$(rump.ifconfig shmif0 |awk '/address:/ { print $2;}')
- export RUMP_SERVER=$SOCK3
- addr3=$(rump.ifconfig shmif0 |awk '/address:/ { print $2;}')
- unset RUMP_SERVER
+ addr1=$(get_macaddr $SOCK1 shmif0)
+ addr3=$(get_macaddr $SOCK3 shmif0)
# Refill the MAC addresses of the endpoints.
export RUMP_SERVER=$SOCK1
@@ -448,11 +445,8 @@ bridge_rtable_body()
setup_bridge
# Get MAC addresses of the endpoints.
- export RUMP_SERVER=$SOCK1
- addr1=$(rump.ifconfig shmif0 |awk '/address:/ { print $2;}')
- export RUMP_SERVER=$SOCK3
- addr3=$(rump.ifconfig shmif0 |awk '/address:/ { print $2;}')
- unset RUMP_SERVER
+ addr1=$(get_macaddr $SOCK1 shmif0)
+ addr3=$(get_macaddr $SOCK3 shmif0)
# Confirm there is no MAC address caches.
export RUMP_SERVER=$SOCK2
Index: src/tests/net/net/t_ping6_opts.sh
diff -u src/tests/net/net/t_ping6_opts.sh:1.6 src/tests/net/net/t_ping6_opts.sh:1.7
--- src/tests/net/net/t_ping6_opts.sh:1.6 Thu Nov 24 09:06:09 2016
+++ src/tests/net/net/t_ping6_opts.sh Thu Nov 24 09:07:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ping6_opts.sh,v 1.6 2016/11/24 09:06:09 ozaki-r Exp $
+# $NetBSD: t_ping6_opts.sh,v 1.7 2016/11/24 09:07:09 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -109,13 +109,6 @@ setup6()
setup_forwarder
}
-get_macaddr()
-{
-
- env RUMP_SERVER=${1} \
- rump.ifconfig ${2} |awk '/address/ {print $2;}'
-}
-
check_echo_request_pkt()
{
local pkt="$1 > $2: .+ echo request"
