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 <bsd.own.mk> 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 <bsd.test.mk> 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 diff -u src/tests/net/mpls/t_mpls_fw6.sh:1.4 src/tests/net/mpls/t_mpls_fw6.sh:1.5 --- src/tests/net/mpls/t_mpls_fw6.sh:1.4 Mon May 13 13:55:09 2019 +++ src/tests/net/mpls/t_mpls_fw6.sh Tue Mar 31 21:49:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: t_mpls_fw6.sh,v 1.4 2019/05/13 17:55:09 bad Exp $ +# $NetBSD: t_mpls_fw6.sh,v 1.5 2020/04/01 01:49:26 christos Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -38,14 +38,6 @@ # # redo the test using IPv6 explicit null label -RUMP_SERVER1=unix://./r1 -RUMP_SERVER2=unix://./r2 -RUMP_SERVER3=unix://./r3 -RUMP_SERVER4=unix://./r4 - -RUMP_FLAGS6="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \ - -lrumpnet_shmif -lrumpnet_netmpls" - atf_test_case mplsfw6 cleanup mplsfw6_head() { @@ -54,16 +46,6 @@ mplsfw6_head() atf_set "require.progs" "rump_server" } -startservers() -{ - - ulimit -r 300 - atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER1} - atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER2} - atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER3} - atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER4} -} - configservers() { @@ -163,19 +145,10 @@ do_check_route() 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 -} - mplsfw6_body() { - startservers + dostart configservers 3 do_check_route doping @@ -199,7 +172,7 @@ mplsfw4_expl_head() mplsfw6_expl_body() { - startservers + dostart configservers 2 do_check_route doping Index: src/tests/net/mpls/t_mpls_fw64.sh diff -u src/tests/net/mpls/t_mpls_fw64.sh:1.4 src/tests/net/mpls/t_mpls_fw64.sh:1.5 --- src/tests/net/mpls/t_mpls_fw64.sh:1.4 Mon May 13 13:55:09 2019 +++ src/tests/net/mpls/t_mpls_fw64.sh Tue Mar 31 21:49:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: t_mpls_fw64.sh,v 1.4 2019/05/13 17:55:09 bad Exp $ +# $NetBSD: t_mpls_fw64.sh,v 1.5 2020/04/01 01:49:26 christos Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -42,24 +42,6 @@ # ping6 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_FLAGS6="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \ - -lrumpnet_shmif -lrumpnet_netmpls" - -startservers() -{ - - ulimit -r 300 - atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER1} - atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER2} - atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER3} - atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER4} -} - configservers() { @@ -161,15 +143,6 @@ do_check_route() 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 -} - atf_test_case mplsfw64_impl cleanup mplsfw64_impl_head() { @@ -181,7 +154,7 @@ mplsfw64_impl_head() mplsfw64_impl_body() { - startservers + dostart configservers 3 do_check_route doping @@ -205,7 +178,7 @@ mplsfw64_expl_head() mplsfw64_expl_body() { - startservers + dostart configservers 2 do_check_route doping Index: src/tests/net/mpls/t_rfc4182.sh diff -u src/tests/net/mpls/t_rfc4182.sh:1.5 src/tests/net/mpls/t_rfc4182.sh:1.6 --- src/tests/net/mpls/t_rfc4182.sh:1.5 Mon May 13 13:55:09 2019 +++ src/tests/net/mpls/t_rfc4182.sh Tue Mar 31 21:49:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: t_rfc4182.sh,v 1.5 2019/05/13 17:55:09 bad Exp $ +# $NetBSD: t_rfc4182.sh,v 1.6 2020/04/01 01:49:26 christos Exp $ # # Copyright (c) 2013 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,14 +39,6 @@ # 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 rfc4182 cleanup rfc4182_head() { @@ -55,16 +47,6 @@ rfc4182_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() { @@ -135,19 +117,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 -} - rfc4182_body() { - startservers + dostart configservers doping } Added files: Index: src/tests/net/mpls/mpls_common.sh diff -u /dev/null src/tests/net/mpls/mpls_common.sh:1.1 --- /dev/null Tue Mar 31 21:49:27 2020 +++ src/tests/net/mpls/mpls_common.sh Tue Mar 31 21:49:26 2020 @@ -0,0 +1,55 @@ +# $NetBSD: mpls_common.sh,v 1.1 2020/04/01 01:49:26 christos Exp $ +# +# Copyright (c) 2020 The NetBSD Foundation, 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. +# + +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_FLAGS6="-lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 \ + -lrumpnet_shmif -lrumpnet_netmpls" + +dostart() +{ + + ulimit -r 400 + atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER1} + atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER2} + atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER3} + atf_check -s exit:0 rump_server ${RUMP_FLAGS6} ${RUMP_SERVER4} +} + +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 +}