From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Aleksandrov Subject: [PATCH net-next 1/2] selftests: forwarding: lib: extract ping and ping6 so they can be reused Date: Tue, 3 Jul 2018 15:42:43 +0300 Message-ID: <20180703124244.6864-3-nikolay@cumulusnetworks.com> References: <20180703124244.6864-1-nikolay@cumulusnetworks.com> Cc: roopa@cumulusnetworks.com, dsahern@kernel.org, idosch@mellanox.com, stephen@networkplumber.org, Nikolay Aleksandrov To: netdev@vger.kernel.org Return-path: Received: from mail-wm0-f67.google.com ([74.125.82.67]:53465 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753347AbeGCMnJ (ORCPT ); Tue, 3 Jul 2018 08:43:09 -0400 Received: by mail-wm0-f67.google.com with SMTP id b188-v6so2199894wme.3 for ; Tue, 03 Jul 2018 05:43:07 -0700 (PDT) In-Reply-To: <20180703124244.6864-1-nikolay@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org List-ID: Extract ping and ping6 command execution so the return value can be checked by the caller, this is needed for port isolation tests that are intended to fail. Signed-off-by: Nikolay Aleksandrov --- tools/testing/selftests/net/forwarding/lib.sh | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index e073918bbe15..2bb9cf303c53 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -659,30 +659,40 @@ multipath_eval() ############################################################################## # Tests -ping_test() +ping_do() { local if_name=$1 local dip=$2 local vrf_name - RET=0 - vrf_name=$(master_name_get $if_name) ip vrf exec $vrf_name $PING $dip -c 10 -i 0.1 -w 2 &> /dev/null +} + +ping_test() +{ + RET=0 + + ping_do $1 $2 check_err $? log_test "ping" } -ping6_test() +ping6_do() { local if_name=$1 local dip=$2 local vrf_name - RET=0 - vrf_name=$(master_name_get $if_name) ip vrf exec $vrf_name $PING6 $dip -c 10 -i 0.1 -w 2 &> /dev/null +} + +ping6_test() +{ + RET=0 + + ping6_do $1 $2 check_err $? log_test "ping6" } -- 2.11.0