Module Name: src
Committed By: christos
Date: Mon Mar 30 13:01:39 UTC 2020
Modified Files:
src/tests/net: net_common.sh
Log Message:
Some interfaces (gif) don't have a mac address...
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/tests/net/net_common.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.39 src/tests/net/net_common.sh:1.40
--- src/tests/net/net_common.sh:1.39 Thu Feb 20 03:02:26 2020
+++ src/tests/net/net_common.sh Mon Mar 30 09:01:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: net_common.sh,v 1.39 2020/02/20 08:02:26 ozaki-r Exp $
+# $NetBSD: net_common.sh,v 1.40 2020/03/30 13:01:39 christos Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -326,13 +326,17 @@ rump_server_add_iface()
if [ -n "$bus" ]; then
atf_check -s exit:0 rump.ifconfig $ifname linkstr $bus
fi
- macaddr=$(get_macaddr $sock $ifname)
- export RUMP_SERVER=$backup
- if [ -f $_rump_server_macaddrs ]; then
- atf_check -s not-exit:0 grep -q $macaddr $_rump_server_macaddrs
+ macaddr=$(get_macaddr $sock $ifname)
+ if [ -n "$macaddr" ]; then
+ if [ -f $_rump_server_macaddrs ]; then
+ atf_check -s not-exit:0 \
+ grep -q $macaddr $_rump_server_macaddrs
+ fi
+ echo $macaddr >> $_rump_server_macaddrs
fi
- echo $macaddr >> $_rump_server_macaddrs
+
+ export RUMP_SERVER=$backup
echo $sock $ifname >> $_rump_server_ifaces
$DEBUG && cat $_rump_server_ifaces
