CVS commit: src/tests/net/mpls
Module Name:src Committed By: christos Date: Wed Apr 1 01:51:02 UTC 2020 Modified Files: src/tests/net/mpls: t_ldp_regen.sh Log Message: more cleanup To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/net/mpls/t_ldp_regen.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/mpls/t_ldp_regen.sh diff -u src/tests/net/mpls/t_ldp_regen.sh:1.9 src/tests/net/mpls/t_ldp_regen.sh:1.10 --- src/tests/net/mpls/t_ldp_regen.sh:1.9 Tue Mar 31 21:49:26 2020 +++ src/tests/net/mpls/t_ldp_regen.sh Tue Mar 31 21:51:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: t_ldp_regen.sh,v 1.9 2020/04/01 01:49:26 christos Exp $ +# $NetBSD: t_ldp_regen.sh,v 1.10 2020/04/01 01:51:02 christos Exp $ # # Copyright (c) 2013 The NetBSD Foundation, Inc. # All rights reserved. @@ -35,15 +35,6 @@ # Now: * R4 should install label IMPLNULL for that prefix # * R3 should realloc the target label from IMPLNULL to something else -export PATH=/sbin:/usr/sbin:/bin:/usr/bin - -RUMP_SERVER1=unix://./r1 -RUMP_SERVER2=unix://./r2 -RUMP_SERVER3=unix://./r3 -RUMP_SERVER4=unix://./r4 - -RUMP_LIBS="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \ - -lrumpnet_netmpls -lrumpnet_shmif" LDP_FLAGS="" atf_test_case ldp_regen cleanup
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: christos
Date: Wed Apr 1 01:49:26 UTC 2020
Modified Files:
src/tests/net/mpls: Makefile t_ldp_regen.sh t_mpls_fw.sh t_mpls_fw6.sh
t_mpls_fw64.sh t_rfc4182.sh
Added Files:
src/tests/net/mpls: mpls_common.sh
Log Message:
factor out common code and set the path.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/net/mpls/Makefile \
src/tests/net/mpls/t_mpls_fw.sh
cvs rdiff -u -r0 -r1.1 src/tests/net/mpls/mpls_common.sh
cvs rdiff -u -r1.8 -r1.9 src/tests/net/mpls/t_ldp_regen.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/mpls/t_mpls_fw6.sh \
src/tests/net/mpls/t_mpls_fw64.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/net/mpls/t_rfc4182.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/mpls/Makefile
diff -u src/tests/net/mpls/Makefile:1.6 src/tests/net/mpls/Makefile:1.7
--- src/tests/net/mpls/Makefile:1.6 Wed May 27 14:13:14 2015
+++ src/tests/net/mpls/Makefile Tue Mar 31 21:49:26 2020
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2015/05/27 18:13:14 kefren Exp $
+# $NetBSD: Makefile,v 1.7 2020/04/01 01:49:26 christos Exp $
#
.include
TESTSDIR= ${TESTSBASE}/net/mpls
-TESTS_SH= t_mpls_fw t_mpls_fw6 t_mpls_fw64 t_rfc4182 t_ldp_regen
+.for name in t_mpls_fw t_mpls_fw6 t_mpls_fw64 t_rfc4182 t_ldp_regen
+TESTS_SH+= ${name}
+TESTS_SH_SRC_${name}= mpls_common.sh ${name}.sh
+.endfor
.include
Index: src/tests/net/mpls/t_mpls_fw.sh
diff -u src/tests/net/mpls/t_mpls_fw.sh:1.6 src/tests/net/mpls/t_mpls_fw.sh:1.7
--- src/tests/net/mpls/t_mpls_fw.sh:1.6 Mon May 13 13:55:09 2019
+++ src/tests/net/mpls/t_mpls_fw.sh Tue Mar 31 21:49:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_mpls_fw.sh,v 1.6 2019/05/13 17:55:09 bad Exp $
+# $NetBSD: t_mpls_fw.sh,v 1.7 2020/04/01 01:49:26 christos Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,15 +36,6 @@
# Do the same for the reverse direction (R4 to R1)
# ping from R1 to R4 right hand side interface
-
-RUMP_SERVER1=unix://./r1
-RUMP_SERVER2=unix://./r2
-RUMP_SERVER3=unix://./r3
-RUMP_SERVER4=unix://./r4
-
-RUMP_FLAGS="-lrumpnet -lrumpnet_net -lrumpnet_netinet \
--lrumpnet_netmpls -lrumpnet_shmif"
-
atf_test_case mplsfw4 cleanup
mplsfw4_head()
{
@@ -53,16 +44,6 @@ mplsfw4_head()
atf_set "require.progs" "rump_server"
}
-startservers()
-{
-
- ulimit -r 300
- atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER1}
- atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER2}
- atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER3}
- atf_check -s exit:0 rump_server ${RUMP_FLAGS} ${RUMP_SERVER4}
-}
-
configservers()
{
@@ -133,19 +114,10 @@ doping()
unset RUMP_SERVER
}
-docleanup()
-{
-
- RUMP_SERVER=${RUMP_SERVER1} rump.halt
- RUMP_SERVER=${RUMP_SERVER2} rump.halt
- RUMP_SERVER=${RUMP_SERVER3} rump.halt
- RUMP_SERVER=${RUMP_SERVER4} rump.halt
-}
-
mplsfw4_body()
{
- startservers
+ dostart
configservers 3
doping
}
@@ -168,7 +140,7 @@ mplsfw4_expl_head()
mplsfw4_expl_body()
{
- startservers
+ dostart
configservers 0
doping
}
Index: src/tests/net/mpls/t_ldp_regen.sh
diff -u src/tests/net/mpls/t_ldp_regen.sh:1.8 src/tests/net/mpls/t_ldp_regen.sh:1.9
--- src/tests/net/mpls/t_ldp_regen.sh:1.8 Mon May 13 13:55:09 2019
+++ src/tests/net/mpls/t_ldp_regen.sh Tue Mar 31 21:49:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_ldp_regen.sh,v 1.8 2019/05/13 17:55:09 bad Exp $
+# $NetBSD: t_ldp_regen.sh,v 1.9 2020/04/01 01:49:26 christos Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,6 +35,7 @@
# Now: * R4 should install label IMPLNULL for that prefix
# * R3 should realloc the target label from IMPLNULL to something else
+export PATH=/sbin:/usr/sbin:/bin:/usr/bin
RUMP_SERVER1=unix://./r1
RUMP_SERVER2=unix://./r2
@@ -68,15 +69,7 @@ newaddr_and_ping() {
rump.ping -n -o -w 5 10.0.5.1
}
-create_servers() {
-
- # allows us to run as normal user
- ulimit -r 400
-
- atf_check -s exit:0 rump_server ${RUMP_LIBS} ${RUMP_SERVER1}
- atf_check -s exit:0 rump_server ${RUMP_LIBS} ${RUMP_SERVER2}
- atf_check -s exit:0 rump_server ${RUMP_LIBS} ${RUMP_SERVER3}
- atf_check -s exit:0 rump_server ${RUMP_LIBS} ${RUMP_SERVER4}
+configservers() {
# LDP HIJACK
export RUMPHIJACK=path=/rump,socket=all,sysctl=yes
@@ -153,21 +146,14 @@ wait_ldp_ok() {
rump.ping -o -w 60 10.0.4.1
}
-docleanup() {
-
- RUMP_SERVER=${RUMP_SERVER1} rump.halt
- RUMP_SERVER=${RUMP_SERVER2} rump.halt
- RUMP_SERVER=${RUMP_SERVER3} rump.halt
- RUMP_SERVER=${RUMP_SERVER4} rump.halt
-}
-
ldp_regen_body() {
if sysctl machdep.cpu_brand 2>/dev/null | grep QEMU >/dev/null 2>&1
then
atf_skip "unreliable under qemu, skip until PR kern/43997 fixed"
fi
- create_servers
+ dostart
+ configservers
wait_ldp_ok
newaddr_and_ping
}
Index: src/tests/net/mpls/t_mpls_fw6.sh
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: ozaki-r
Date: Wed Aug 10 07:50:37 UTC 2016
Modified Files:
src/tests/net/mpls: t_ldp_regen.sh t_mpls_fw.sh t_mpls_fw6.sh
t_mpls_fw64.sh t_rfc4182.sh
Log Message:
Add rumpdev library for config_cfdriver_attach
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/net/mpls/t_ldp_regen.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/net/mpls/t_mpls_fw.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/net/mpls/t_mpls_fw6.sh \
src/tests/net/mpls/t_mpls_fw64.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/net/mpls/t_rfc4182.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/mpls/t_ldp_regen.sh
diff -u src/tests/net/mpls/t_ldp_regen.sh:1.6 src/tests/net/mpls/t_ldp_regen.sh:1.7
--- src/tests/net/mpls/t_ldp_regen.sh:1.6 Wed May 13 12:01:24 2015
+++ src/tests/net/mpls/t_ldp_regen.sh Wed Aug 10 07:50:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ldp_regen.sh,v 1.6 2015/05/13 12:01:24 martin Exp $
+# $NetBSD: t_ldp_regen.sh,v 1.7 2016/08/10 07:50:37 ozaki-r Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -41,7 +41,8 @@ RUMP_SERVER2=unix://./r2
RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
-RUMP_LIBS="-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_shmif"
+RUMP_LIBS="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \
+ -lrumpdev -lrumpnet_netmpls -lrumpnet_shmif"
LDP_FLAGS=""
atf_test_case ldp_regen cleanup
Index: src/tests/net/mpls/t_mpls_fw.sh
diff -u src/tests/net/mpls/t_mpls_fw.sh:1.4 src/tests/net/mpls/t_mpls_fw.sh:1.5
--- src/tests/net/mpls/t_mpls_fw.sh:1.4 Tue Mar 18 18:20:44 2014
+++ src/tests/net/mpls/t_mpls_fw.sh Wed Aug 10 07:50:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_mpls_fw.sh,v 1.4 2014/03/18 18:20:44 riastradh Exp $
+# $NetBSD: t_mpls_fw.sh,v 1.5 2016/08/10 07:50:37 ozaki-r Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -42,8 +42,8 @@ RUMP_SERVER2=unix://./r2
RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
-RUMP_FLAGS=\
-"-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_shmif"
+RUMP_FLAGS="-lrumpnet -lrumpnet_net -lrumpnet_netinet \
+-lrumpdev -lrumpnet_netmpls -lrumpnet_shmif"
atf_test_case mplsfw4 cleanup
mplsfw4_head()
Index: src/tests/net/mpls/t_mpls_fw6.sh
diff -u src/tests/net/mpls/t_mpls_fw6.sh:1.2 src/tests/net/mpls/t_mpls_fw6.sh:1.3
--- src/tests/net/mpls/t_mpls_fw6.sh:1.2 Fri Aug 7 00:50:12 2015
+++ src/tests/net/mpls/t_mpls_fw6.sh Wed Aug 10 07:50:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_mpls_fw6.sh,v 1.2 2015/08/07 00:50:12 ozaki-r Exp $
+# $NetBSD: t_mpls_fw6.sh,v 1.3 2016/08/10 07:50:37 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -43,8 +43,8 @@ RUMP_SERVER2=unix://./r2
RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
-RUMP_FLAGS6=\
-"-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_shmif"
+RUMP_FLAGS6="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \
+ -lrumpdev -lrumpnet_shmif -lrumpnet_netmpls"
atf_test_case mplsfw6 cleanup
mplsfw6_head()
Index: src/tests/net/mpls/t_mpls_fw64.sh
diff -u src/tests/net/mpls/t_mpls_fw64.sh:1.2 src/tests/net/mpls/t_mpls_fw64.sh:1.3
--- src/tests/net/mpls/t_mpls_fw64.sh:1.2 Fri Aug 7 00:50:12 2015
+++ src/tests/net/mpls/t_mpls_fw64.sh Wed Aug 10 07:50:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_mpls_fw64.sh,v 1.2 2015/08/07 00:50:12 ozaki-r Exp $
+# $NetBSD: t_mpls_fw64.sh,v 1.3 2016/08/10 07:50:37 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -47,8 +47,8 @@ RUMP_SERVER2=unix://./r2
RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
-RUMP_FLAGS6=\
-"-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_shmif"
+RUMP_FLAGS6="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \
+ -lrumpdev -lrumpnet_shmif -lrumpnet_netmpls"
startservers()
{
Index: src/tests/net/mpls/t_rfc4182.sh
diff -u src/tests/net/mpls/t_rfc4182.sh:1.3 src/tests/net/mpls/t_rfc4182.sh:1.4
--- src/tests/net/mpls/t_rfc4182.sh:1.3 Tue Mar 18 18:20:44 2014
+++ src/tests/net/mpls/t_rfc4182.sh Wed Aug 10 07:50:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_rfc4182.sh,v 1.3 2014/03/18 18:20:44 riastradh Exp $
+# $NetBSD: t_rfc4182.sh,v 1.4 2016/08/10 07:50:37 ozaki-r Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -44,8 +44,8 @@ RUMP_SERVER2=unix://./r2
RUMP_SERVER3=unix://./r3
RUMP_SERVER4=unix://./r4
-RUMP_FLAGS=\
-"-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_shmif"
+RUMP_FLAGS="-lrumpnet -lrumpnet_net -lrumpnet_netinet \
+-lrumpdev -lrumpnet_netmpls -lrumpnet_shmif"
atf_test_case rfc4182 cleanup
rfc4182_head()
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: martin
Date: Wed May 13 12:01:24 UTC 2015
Modified Files:
src/tests/net/mpls: t_ldp_regen.sh
Log Message:
Before pinging, wait for addresses to come out of tentative state
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/net/mpls/t_ldp_regen.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/mpls/t_ldp_regen.sh
diff -u src/tests/net/mpls/t_ldp_regen.sh:1.5 src/tests/net/mpls/t_ldp_regen.sh:1.6
--- src/tests/net/mpls/t_ldp_regen.sh:1.5 Mon May 4 10:57:17 2015
+++ src/tests/net/mpls/t_ldp_regen.sh Wed May 13 12:01:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_ldp_regen.sh,v 1.5 2015/05/04 10:57:17 martin Exp $
+# $NetBSD: t_ldp_regen.sh,v 1.6 2015/05/13 12:01:24 martin Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -57,6 +57,8 @@ newaddr_and_ping() {
# Add new address on R4
RUMP_SERVER=${RUMP_SERVER4} atf_check -s exit:0 \
rump.ifconfig shmif1 10.0.5.1/24 alias
+ RUMP_SERVER=${RUMP_SERVER4} atf_check -s exit:0 \
+ rump.ifconfig -w 60
# Now ldpd on R5 should take notice of the new route and announce it
# to R4's ldpd. ldpd on R4 should verify that the next hop
@@ -145,6 +147,8 @@ create_servers() {
wait_ldp_ok() {
RUMP_SERVER=${RUMP_SERVER1} atf_check -s exit:0 -o ignore -e ignore \
+ rump.ifconfig -w 60
+ RUMP_SERVER=${RUMP_SERVER1} atf_check -s exit:0 -o ignore -e ignore \
rump.ping -o -w 60 10.0.4.1
}
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: martin
Date: Mon May 4 10:57:18 UTC 2015
Modified Files:
src/tests/net/mpls: t_ldp_regen.sh
Log Message:
Cosmetics: hide an error message from sysctl (machdep.cpu_brand is not
available on most architectures)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/net/mpls/t_ldp_regen.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/mpls/t_ldp_regen.sh
diff -u src/tests/net/mpls/t_ldp_regen.sh:1.4 src/tests/net/mpls/t_ldp_regen.sh:1.5
--- src/tests/net/mpls/t_ldp_regen.sh:1.4 Mon Sep 1 06:38:35 2014
+++ src/tests/net/mpls/t_ldp_regen.sh Mon May 4 10:57:17 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_ldp_regen.sh,v 1.4 2014/09/01 06:38:35 gson Exp $
+# $NetBSD: t_ldp_regen.sh,v 1.5 2015/05/04 10:57:17 martin Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -158,7 +158,7 @@ docleanup() {
ldp_regen_body() {
-if sysctl machdep.cpu_brand | grep QEMU /dev/null 21
+if sysctl machdep.cpu_brand 2/dev/null | grep QEMU /dev/null 21
then
atf_skip unreliable under qemu, skip until PR kern/43997 fixed
fi
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: gson
Date: Mon Sep 1 06:38:35 UTC 2014
Modified Files:
src/tests/net/mpls: t_ldp_regen.sh
Log Message:
The t_ldp_regen test frequently fails under qemu, but reliably passes
on real hardware. The failures are hardly surprising given that qemu
timing is off by a is off by a factor of two as reported in
PR kern/43997. Disabling the test on qemu for now; it should be
re-enabled once 43997 has been fixed to see if it still fails then.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/net/mpls/t_ldp_regen.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/mpls/t_ldp_regen.sh
diff -u src/tests/net/mpls/t_ldp_regen.sh:1.3 src/tests/net/mpls/t_ldp_regen.sh:1.4
--- src/tests/net/mpls/t_ldp_regen.sh:1.3 Fri Jan 3 13:14:50 2014
+++ src/tests/net/mpls/t_ldp_regen.sh Mon Sep 1 06:38:35 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_ldp_regen.sh,v 1.3 2014/01/03 13:14:50 pooka Exp $
+# $NetBSD: t_ldp_regen.sh,v 1.4 2014/09/01 06:38:35 gson Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -158,6 +158,10 @@ docleanup() {
ldp_regen_body() {
+if sysctl machdep.cpu_brand | grep QEMU /dev/null 21
+ then
+ atf_skip unreliable under qemu, skip until PR kern/43997 fixed
+ fi
create_servers
wait_ldp_ok
newaddr_and_ping
CVS commit: src/tests/net/mpls
Module Name:src Committed By: pooka Date: Fri Jan 3 13:14:50 UTC 2014 Modified Files: src/tests/net/mpls: t_ldp_regen.sh Log Message: ldpd wants inet6 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/net/mpls/t_ldp_regen.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/mpls/t_ldp_regen.sh diff -u src/tests/net/mpls/t_ldp_regen.sh:1.2 src/tests/net/mpls/t_ldp_regen.sh:1.3 --- src/tests/net/mpls/t_ldp_regen.sh:1.2 Sat Jul 27 14:36:39 2013 +++ src/tests/net/mpls/t_ldp_regen.sh Fri Jan 3 13:14:50 2014 @@ -1,4 +1,4 @@ -# $NetBSD: t_ldp_regen.sh,v 1.2 2013/07/27 14:36:39 kefren Exp $ +# $NetBSD: t_ldp_regen.sh,v 1.3 2014/01/03 13:14:50 pooka Exp $ # # Copyright (c) 2013 The NetBSD Foundation, Inc. # All rights reserved. @@ -41,7 +41,7 @@ RUMP_SERVER2=unix://./r2 RUMP_SERVER3=unix://./r3 RUMP_SERVER4=unix://./r4 -RUMP_LIBS=-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_shmif +RUMP_LIBS=-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_shmif LDP_FLAGS= atf_test_case ldp_regen cleanup
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: kefren
Date: Sat Jul 27 14:36:39 UTC 2013
Modified Files:
src/tests/net/mpls: t_ldp_regen.sh
Log Message:
don't expect failure anymore
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/mpls/t_ldp_regen.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/mpls/t_ldp_regen.sh
diff -u src/tests/net/mpls/t_ldp_regen.sh:1.1 src/tests/net/mpls/t_ldp_regen.sh:1.2
--- src/tests/net/mpls/t_ldp_regen.sh:1.1 Thu Jul 25 14:28:29 2013
+++ src/tests/net/mpls/t_ldp_regen.sh Sat Jul 27 14:36:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_ldp_regen.sh,v 1.1 2013/07/25 14:28:29 kefren Exp $
+# $NetBSD: t_ldp_regen.sh,v 1.2 2013/07/27 14:36:39 kefren Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -61,8 +61,6 @@ newaddr_and_ping() {
# Now ldpd on R5 should take notice of the new route and announce it
# to R4's ldpd. ldpd on R4 should verify that the next hop
# corresponds to its routing table and change its tag entry
-
- atf_expect_fail IMPLNULL label bindings are not upgraded properly
RUMP_SERVER=${RUMP_SERVER1} atf_check -s exit:0 -o ignore -e ignore \
rump.ping -n -o -w 5 10.0.5.1
}
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: kefren
Date: Sat Jul 27 14:39:24 UTC 2013
Modified Files:
src/tests/net/mpls: t_ldp_static.sh
Log Message:
Disable ip forwarding at penultimate hop
Raise the ping wait time a little bit in order for changes to propagate
over ldp
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/mpls/t_ldp_static.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/mpls/t_ldp_static.sh
diff -u src/tests/net/mpls/t_ldp_static.sh:1.1 src/tests/net/mpls/t_ldp_static.sh:1.2
--- src/tests/net/mpls/t_ldp_static.sh:1.1 Thu Jul 25 14:28:29 2013
+++ src/tests/net/mpls/t_ldp_static.sh Sat Jul 27 14:39:24 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_ldp_static.sh,v 1.1 2013/07/25 14:28:29 kefren Exp $
+# $NetBSD: t_ldp_static.sh,v 1.2 2013/07/27 14:39:24 kefren Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -86,7 +86,7 @@ ping_one() {
# to R4's ldpd. ldpd on R4 should verify that the next hop
# corresponds to its routing table and tag the route to an
RUMP_SERVER=${RUMP_SERVER1} atf_check -s exit:0 -o ignore -e ignore \
- rump.ping -n -o -w 2 $1
+ rump.ping -n -o -w 5 $1
# Tear it down and bye bye
RUMP_SERVER=${RUMP_SERVER5} atf_check -s exit:0 \
@@ -161,6 +161,7 @@ create_servers() {
atf_check -s exit:0 rump.ifconfig shmif1 10.0.4.1/24
atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
atf_check -s exit:0 rump.sysctl -q -w net.mpls.forwarding=1
+ atf_check -s exit:0 rump.sysctl -q -w net.inet.ip.forwarding=0
atf_check -s exit:0 rump.ifconfig mpls0 create up
atf_check -s exit:0 rump.route -q add 10.0.1.0/24 10.0.3.1
atf_check -s exit:0 rump.route -q add 10.0.5.0/24 10.0.4.2
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: martin
Date: Tue Jul 23 12:14:49 UTC 2013
Modified Files:
src/tests/net/mpls: t_mpls_fw.sh
Log Message:
Move all shm files from /tmp into . so ATF can automatically do cleanup
for us. Ok: kefren
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/mpls/t_mpls_fw.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/mpls/t_mpls_fw.sh
diff -u src/tests/net/mpls/t_mpls_fw.sh:1.1 src/tests/net/mpls/t_mpls_fw.sh:1.2
--- src/tests/net/mpls/t_mpls_fw.sh:1.1 Fri Jul 19 04:00:40 2013
+++ src/tests/net/mpls/t_mpls_fw.sh Tue Jul 23 12:14:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_mpls_fw.sh,v 1.1 2013/07/19 04:00:40 kefren Exp $
+# $NetBSD: t_mpls_fw.sh,v 1.2 2013/07/23 12:14:49 martin Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -69,7 +69,7 @@ configservers()
# Setup the first server
export RUMP_SERVER=${RUMP_SERVER1}
atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom1
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.1/24
atf_check -s exit:0 rump.ifconfig mpls0 create up
atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
@@ -80,10 +80,10 @@ configservers()
# Setup the second server
export RUMP_SERVER=${RUMP_SERVER2}
atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom1
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.2/24
atf_check -s exit:0 rump.ifconfig shmif1 create
- atf_check -s exit:0 rump.ifconfig shmif1 linkstr /tmp/shdom2
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom2
atf_check -s exit:0 rump.ifconfig shmif1 10.0.2.1/24
atf_check -s exit:0 rump.ifconfig mpls0 create up
atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
@@ -95,10 +95,10 @@ configservers()
# Setup the third server
export RUMP_SERVER=${RUMP_SERVER3}
atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom2
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom2
atf_check -s exit:0 rump.ifconfig shmif0 10.0.2.2/24
atf_check -s exit:0 rump.ifconfig shmif1 create
- atf_check -s exit:0 rump.ifconfig shmif1 linkstr /tmp/shdom3
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom3
atf_check -s exit:0 rump.ifconfig shmif1 10.0.3.1/24
atf_check -s exit:0 rump.ifconfig mpls0 create up
atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
@@ -110,10 +110,10 @@ configservers()
# Setup the fourth server
export RUMP_SERVER=${RUMP_SERVER4}
atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom3
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom3
atf_check -s exit:0 rump.ifconfig shmif0 10.0.3.2/24
atf_check -s exit:0 rump.ifconfig shmif1 create
- atf_check -s exit:0 rump.ifconfig shmif1 linkstr /tmp/shdom4
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom4
atf_check -s exit:0 rump.ifconfig shmif1 10.0.4.1/24
atf_check -s exit:0 rump.ifconfig mpls0 create up
atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
CVS commit: src/tests/net/mpls
Module Name:src
Committed By: kefren
Date: Tue Jul 23 12:41:01 UTC 2013
Modified Files:
src/tests/net/mpls: t_mpls_fw.sh t_rfc4182.sh
Log Message:
Use . for shm bus path and rump_server url instead of /tmp
Exit after first reply in mpls_fw
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/mpls/t_mpls_fw.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/net/mpls/t_rfc4182.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/mpls/t_mpls_fw.sh
diff -u src/tests/net/mpls/t_mpls_fw.sh:1.2 src/tests/net/mpls/t_mpls_fw.sh:1.3
--- src/tests/net/mpls/t_mpls_fw.sh:1.2 Tue Jul 23 12:14:49 2013
+++ src/tests/net/mpls/t_mpls_fw.sh Tue Jul 23 12:41:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_mpls_fw.sh,v 1.2 2013/07/23 12:14:49 martin Exp $
+# $NetBSD: t_mpls_fw.sh,v 1.3 2013/07/23 12:41:01 kefren Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -37,10 +37,10 @@
# ping from R1 to R4 right hand side interface
-RUMP_SERVER1=unix:///tmp/r1
-RUMP_SERVER2=unix:///tmp/r2
-RUMP_SERVER3=unix:///tmp/r3
-RUMP_SERVER4=unix:///tmp/r4
+RUMP_SERVER1=unix://./r1
+RUMP_SERVER2=unix://./r2
+RUMP_SERVER3=unix://./r3
+RUMP_SERVER4=unix://./r4
RUMP_FLAGS=\
-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_shmif
@@ -129,7 +129,7 @@ doping()
export RUMP_SERVER=${RUMP_SERVER1}
atf_check -s exit:0 -o match:64 bytes from 10.0.4.1: icmp_seq= \
- rump.ping -n -w 5 10.0.4.1
+ rump.ping -n -o -w 5 10.0.4.1
unset RUMP_SERVER
}
Index: src/tests/net/mpls/t_rfc4182.sh
diff -u src/tests/net/mpls/t_rfc4182.sh:1.1 src/tests/net/mpls/t_rfc4182.sh:1.2
--- src/tests/net/mpls/t_rfc4182.sh:1.1 Tue Jul 23 11:26:33 2013
+++ src/tests/net/mpls/t_rfc4182.sh Tue Jul 23 12:41:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_rfc4182.sh,v 1.1 2013/07/23 11:26:33 kefren Exp $
+# $NetBSD: t_rfc4182.sh,v 1.2 2013/07/23 12:41:01 kefren Exp $
#
# Copyright (c) 2013 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,10 +39,10 @@
# ping from R1 to R4 right hand side interface
-RUMP_SERVER1=unix:///tmp/r1
-RUMP_SERVER2=unix:///tmp/r2
-RUMP_SERVER3=unix:///tmp/r3
-RUMP_SERVER4=unix:///tmp/r4
+RUMP_SERVER1=unix://./r1
+RUMP_SERVER2=unix://./r2
+RUMP_SERVER3=unix://./r3
+RUMP_SERVER4=unix://./r4
RUMP_FLAGS=\
-lrumpnet -lrumpnet_net -lrumpnet_netmpls -lrumpnet_netinet -lrumpnet_shmif
@@ -71,7 +71,7 @@ configservers()
# Setup the first server
export RUMP_SERVER=${RUMP_SERVER1}
atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom1
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.1/24
atf_check -s exit:0 rump.ifconfig mpls0 create up
atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
@@ -82,10 +82,10 @@ configservers()
# Setup the second server
export RUMP_SERVER=${RUMP_SERVER2}
atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom1
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom1
atf_check -s exit:0 rump.ifconfig shmif0 10.0.1.2/24
atf_check -s exit:0 rump.ifconfig shmif1 create
- atf_check -s exit:0 rump.ifconfig shmif1 linkstr /tmp/shdom2
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom2
atf_check -s exit:0 rump.ifconfig shmif1 10.0.2.1/24
atf_check -s exit:0 rump.ifconfig mpls0 create up
atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
@@ -97,10 +97,10 @@ configservers()
# Setup the third server
export RUMP_SERVER=${RUMP_SERVER3}
atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom2
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom2
atf_check -s exit:0 rump.ifconfig shmif0 10.0.2.2/24
atf_check -s exit:0 rump.ifconfig shmif1 create
- atf_check -s exit:0 rump.ifconfig shmif1 linkstr /tmp/shdom3
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom3
atf_check -s exit:0 rump.ifconfig shmif1 10.0.3.1/24
atf_check -s exit:0 rump.ifconfig mpls0 create up
atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
@@ -112,10 +112,10 @@ configservers()
# Setup the fourth server
export RUMP_SERVER=${RUMP_SERVER4}
atf_check -s exit:0 rump.ifconfig shmif0 create
- atf_check -s exit:0 rump.ifconfig shmif0 linkstr /tmp/shdom3
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ./shdom3
atf_check -s exit:0 rump.ifconfig shmif0 10.0.3.2/24
atf_check -s exit:0 rump.ifconfig shmif1 create
- atf_check -s exit:0 rump.ifconfig shmif1 linkstr /tmp/shdom4
+ atf_check -s exit:0 rump.ifconfig shmif1 linkstr ./shdom4
atf_check -s exit:0 rump.ifconfig shmif1 10.0.4.1/24
atf_check -s exit:0 rump.ifconfig mpls0 create up
atf_check -s exit:0 rump.sysctl -q -w net.mpls.accept=1
