[src/trunk]: src/tests/net Move HIJACKING definition to net_common.sh

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f25d537a1079
branches:  trunk
changeset: 349109:f25d537a1079
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Nov 24 09:03:53 2016 +0000

description:
Move HIJACKING definition to net_common.sh

diffstat:

 tests/net/arp/t_arp.sh        |  3 +--
 tests/net/arp/t_dad.sh        |  3 +--
 tests/net/if_gif/Makefile     |  7 +++++--
 tests/net/if_gif/t_gif.sh     |  3 +--
 tests/net/if_pppoe/Makefile   |  7 +++++--
 tests/net/if_pppoe/t_pppoe.sh |  3 ++-
 tests/net/if_tap/t_tap.sh     |  3 +--
 tests/net/ndp/t_dad.sh        |  3 +--
 tests/net/ndp/t_ndp.sh        |  3 +--
 tests/net/net/t_mtudisc.sh    |  3 +--
 tests/net/net/t_mtudisc6.sh   |  3 +--
 tests/net/net_common.sh       |  4 +++-
 12 files changed, 23 insertions(+), 22 deletions(-)

diffs (209 lines):

diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/arp/t_arp.sh
--- a/tests/net/arp/t_arp.sh    Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/arp/t_arp.sh    Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_arp.sh,v 1.19 2016/11/24 08:52:19 ozaki-r Exp $
+#      $NetBSD: t_arp.sh,v 1.20 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -27,7 +27,6 @@
 
 inetlib="-lrumpnet_shmif -lrumpnet_tap -lrumpnet -lrumpnet_net -lrumpnet_netinet"
 inetserver="rump_server $inetlib -lrumpdev"
-HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
 
 SOCKSRC=unix://commsock1
 SOCKDST=unix://commsock2
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/arp/t_dad.sh
--- a/tests/net/arp/t_dad.sh    Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/arp/t_dad.sh    Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_dad.sh,v 1.10 2016/11/24 08:52:19 ozaki-r Exp $
+#      $NetBSD: t_dad.sh,v 1.11 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -27,7 +27,6 @@
 
 inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
 inetserver="${inetserver} -lrumpdev"
-HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
 
 SOCKLOCAL=unix://commsock1
 SOCKPEER=unix://commsock2
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/if_gif/Makefile
--- a/tests/net/if_gif/Makefile Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/if_gif/Makefile Thu Nov 24 09:03:53 2016 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2015/11/05 00:02:59 knakahara Exp $
+# $NetBSD: Makefile,v 1.2 2016/11/24 09:03:53 ozaki-r Exp $
 #
 
 .include <bsd.own.mk>
 
 TESTSDIR=      ${TESTSBASE}/net/if_gif
 
-TESTS_SH=      t_gif
+.for name in gif
+TESTS_SH+=             t_${name}
+TESTS_SH_SRC_t_${name}=        ../net_common.sh t_${name}.sh
+.endfor
 
 .include <bsd.test.mk>
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/if_gif/t_gif.sh
--- a/tests/net/if_gif/t_gif.sh Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/if_gif/t_gif.sh Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_gif.sh,v 1.6 2016/10/18 04:10:24 ozaki-r Exp $
+#      $NetBSD: t_gif.sh,v 1.7 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2015 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -27,7 +27,6 @@
 
 server="rump_server -v -lrumpdev -lrumpnet -lrumpnet_net -lrumpnet_netinet \
                    -lrumpnet_netinet6 -lrumpnet_shmif -lrumpnet_gif"
-HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
 
 SOCK1=unix://commsock1 # for ROUTER1
 SOCK2=unix://commsock2 # for ROUTER2
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/if_pppoe/Makefile
--- a/tests/net/if_pppoe/Makefile       Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/if_pppoe/Makefile       Thu Nov 24 09:03:53 2016 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2016/11/24 07:31:14 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.3 2016/11/24 09:03:53 ozaki-r Exp $
 #
 
 .include <bsd.own.mk>
 
 TESTSDIR=      ${TESTSBASE}/net/if_pppoe
 
-TESTS_SH=      t_pppoe
+.for name in pppoe
+TESTS_SH+=             t_${name}
+TESTS_SH_SRC_t_${name}=        ../net_common.sh t_${name}.sh
+.endfor
 
 .include <bsd.test.mk>
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/if_pppoe/t_pppoe.sh
--- a/tests/net/if_pppoe/t_pppoe.sh     Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/if_pppoe/t_pppoe.sh     Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_pppoe.sh,v 1.11 2016/11/10 10:32:59 knakahara Exp $
+#      $NetBSD: t_pppoe.sh,v 1.12 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -28,6 +28,7 @@
 server="rump_server -lrump -lrumpnet -lrumpnet_net -lrumpnet_netinet   \
                    -lrumpnet_netinet6 -lrumpnet_shmif -lrumpdev        \
                    -lrumpnet_pppoe"
+# pppoectl doesn't work with RUMPHIJACK=sysctl=yes
 HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so"
 
 SERVER=unix://commsock1
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/if_tap/t_tap.sh
--- a/tests/net/if_tap/t_tap.sh Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/if_tap/t_tap.sh Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_tap.sh,v 1.4 2016/11/07 05:25:37 ozaki-r Exp $
+#      $NetBSD: t_tap.sh,v 1.5 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -27,7 +27,6 @@
 
 RUMP_FLAGS="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6"
 RUMP_FLAGS="$RUMP_FLAGS -lrumpnet_shmif -lrumpnet_tap -lrumpnet_bridge -lrumpdev"
-HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
 
 SOCK_LOCAL=unix://commsock1
 SOCK_REMOTE=unix://commsock2
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/ndp/t_dad.sh
--- a/tests/net/ndp/t_dad.sh    Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/ndp/t_dad.sh    Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_dad.sh,v 1.10 2016/11/24 08:52:20 ozaki-r Exp $
+#      $NetBSD: t_dad.sh,v 1.11 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -28,7 +28,6 @@
 inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
 inetserver="$inetserver -lrumpnet_netinet6 -lrumpnet_shmif"
 inetserver="$inetserver -lrumpdev"
-HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
 
 SOCKLOCAL=unix://commsock1
 SOCKPEER=unix://commsock2
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/ndp/t_ndp.sh
--- a/tests/net/ndp/t_ndp.sh    Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/ndp/t_ndp.sh    Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_ndp.sh,v 1.15 2016/11/24 08:52:20 ozaki-r Exp $
+#      $NetBSD: t_ndp.sh,v 1.16 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -28,7 +28,6 @@
 inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
 inetserver="$inetserver -lrumpnet_netinet6 -lrumpnet_shmif"
 inetserver="$inetserver -lrumpdev"
-HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
 
 SOCKSRC=unix://commsock1
 SOCKDST=unix://commsock2
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/net/t_mtudisc.sh
--- a/tests/net/net/t_mtudisc.sh        Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/net/t_mtudisc.sh        Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_mtudisc.sh,v 1.4 2016/11/24 08:52:20 ozaki-r Exp $
+#      $NetBSD: t_mtudisc.sh,v 1.5 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -28,7 +28,6 @@
 inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
 inetserver="$inetserver -lrumpnet_netinet6 -lrumpnet_shmif"
 inetserver="$inetserver -lrumpdev"
-HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
 
 SOCKLOCAL=unix://commsock1
 SOCKGATEWAY=unix://commsock2
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/net/t_mtudisc6.sh
--- a/tests/net/net/t_mtudisc6.sh       Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/net/t_mtudisc6.sh       Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_mtudisc6.sh,v 1.2 2016/11/24 08:52:20 ozaki-r Exp $
+#      $NetBSD: t_mtudisc6.sh,v 1.3 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -28,7 +28,6 @@
 inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet"
 inetserver="$inetserver -lrumpnet_netinet6 -lrumpnet_shmif"
 inetserver="$inetserver -lrumpdev"
-HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
 
 SOCKLOCAL=unix://commsock1
 SOCKGATEWAY=unix://commsock2
diff -r f5c4f3e847a1 -r f25d537a1079 tests/net/net_common.sh
--- a/tests/net/net_common.sh   Thu Nov 24 08:52:19 2016 +0000
+++ b/tests/net/net_common.sh   Thu Nov 24 09:03:53 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: net_common.sh,v 1.1 2016/11/24 08:52:19 ozaki-r Exp $
+#      $NetBSD: net_common.sh,v 1.2 2016/11/24 09:03:53 ozaki-r Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -29,6 +29,8 @@
 # Common utility functions for tests/net
 #
 
+HIJACKING="env LD_PRELOAD=/usr/lib/librumphijack.so RUMPHIJACK=sysctl=yes"
+
 extract_new_packets()
 {
        local bus=$1