From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74531C4CEC9 for ; Tue, 17 Sep 2019 17:27:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DC2021852 for ; Tue, 17 Sep 2019 17:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568741222; bh=7r8eF29fs/tdpwPKzP94o2oeY1M/LYAdlmqGJPp8IBM=; h=From:To:Cc:Subject:Date:List-ID:From; b=rIzMT3x3WYtjwTLr7bV1FxAP3FPbkM1r7B4wpOH5VC/dGZ+lxt7FaYXI7+mNi0m9m a/pCiFpIRtVcSfxAWUh+LpvcvjXzIx8lJAbr81JVi+K5H7UtE7NpyMjD+T8I5i67mW V0EOA8KNyXuh/njwJ1AraBVl8+24XI7qeeXT5/i0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731089AbfIQR1B (ORCPT ); Tue, 17 Sep 2019 13:27:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:40470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731078AbfIQR1B (ORCPT ); Tue, 17 Sep 2019 13:27:01 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8A1152171F; Tue, 17 Sep 2019 17:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568741220; bh=7r8eF29fs/tdpwPKzP94o2oeY1M/LYAdlmqGJPp8IBM=; h=From:To:Cc:Subject:Date:From; b=U9KzfgO73NxuTpYv67p7lcgOLwapwppuPUrQjxYFA/0bRNuMivSF9pDBsBUYqtlq7 VmV72R3rKCB0V4xjy0+gHxC2/fjTW7CBGhGgklE5GrVsi/v2aNXRNbDE4cHQ4T6Z6a kNEDVinZWGL+nOxFx9FkYOuragN9hc7EEB7Py4Co= From: David Ahern To: davem@davemloft.net Cc: netdev@vger.kernel.org, David Ahern Subject: [PATCH net] selftests: Update fib_tests to handle missing ping6 Date: Tue, 17 Sep 2019 10:30:21 -0700 Message-Id: <20190917173021.19705-1-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Some distributions (e.g., debian buster) do not install ping6. Re-use the hook in pmtu.sh to detect this and fallback to ping. Fixes: a0e11da78f48 ("fib_tests: Add tests for metrics on routes") Signed-off-by: David Ahern --- tools/testing/selftests/net/fib_tests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh index 4465fc2dae14..cba83a12da82 100755 --- a/tools/testing/selftests/net/fib_tests.sh +++ b/tools/testing/selftests/net/fib_tests.sh @@ -17,6 +17,8 @@ PAUSE=no IP="ip -netns ns1" NS_EXEC="ip netns exec ns1" +which ping6 > /dev/null 2>&1 && ping6=$(which ping6) || ping6=$(which ping) + log_test() { local rc=$1 @@ -1086,7 +1088,7 @@ ipv6_route_metrics_test() log_test $rc 0 "Multipath route with mtu metric" $IP -6 ro add 2001:db8:104::/64 via 2001:db8:101::2 mtu 1300 - run_cmd "ip netns exec ns1 ping6 -w1 -c1 -s 1500 2001:db8:104::1" + run_cmd "ip netns exec ns1 ${ping6} -w1 -c1 -s 1500 2001:db8:104::1" log_test $? 0 "Using route with mtu metric" run_cmd "$IP -6 ro add 2001:db8:114::/64 via 2001:db8:101::2 congctl lock foo" -- 2.11.0