From patchwork Wed Sep 9 18:26:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1360931 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bmr8F6yK0z9sTH for ; Thu, 10 Sep 2020 04:26:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729953AbgIIS0v (ORCPT ); Wed, 9 Sep 2020 14:26:51 -0400 Received: from mailrelay105.isp.belgacom.be ([195.238.20.132]:5273 "EHLO mailrelay105.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729525AbgIIS0o (ORCPT ); Wed, 9 Sep 2020 14:26:44 -0400 IronPort-SDR: pNX6ncdP65mDe1+h142elqQ5LUq0gy5gtBLRwL9zTsIHJwzLSrJgbGrLD0LA18UefqzTjMEMAQ 2UwwWg87erL19RWH2XZUyxL6AEnit+lISd0MnlokClJzSPyP6VjYQrrsAX0exVhAJ56NLg6dSP 30Ta4D2VfWvUzChbFtR0419icVua4PzeDPGDrCO6a0NUOc31vPfCp/aKdu3WSfQzf63YjXXw0g yzXMlMAeZzB/pa13tSygbcGqAe9Ya0xXbp31ueY5ZuszsA/ZtQYHPDNLqY0FYE6VQ8VrCttS2c FxE= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:a5HhahRaTOHR35jRawbZFyIxhNpsv+yvbD5Q0YIujvd0So/mwa67ZRKEt8tkgFKBZ4jH8fUM07OQ7/m+HzVdvN3R4TgrS99lb1c9k8IYnggtUoauKHbQC7rUVRE8B9lIT1R//nu2YgB/Ecf6YEDO8DXptWZBUhrwOhBoKevrB4Xck9q41/yo+53Ufg5EmCexbal9IRmrrAjdrNQajItiJ6o+yRbEpmZDdvhLy29vOV+dhQv36N2q/J5k/SRQuvYh+NBFXK7nYak2TqFWASo/PWwt68LlqRfMTQ2U5nsBSWoWiQZHAxLE7B7hQJj8tDbxu/dn1ymbOc32Sq00WSin4qx2RhLklDsLOjgk+2zRl8d+jr9UoAi5qhJ/3YDafY+bOvl5cKzSct0XXnZNU8VLWiBdGI6wc5cDAuwcNuhYtYn9oF4OoAO+Cwa2H+zvyyVHhnnr1qM6yeQuDxzJ0xI6H9IPrHvUr8j+OaAcUe+v16bIwy7Ob+hV2Tb97ojHbAwhreuXUr1uaMfcz1QkGAzZgFuKs4PlIy+V2foXs2id9+duW+GihmonpQxwojWj2MkhhInUi44J11zI6SR0zok6K9ClRkN2f8OpHZtSuiyEOIV6Xs0sTW5stSg6yrMKp5q2cS4Xw5ok3x7Sc/iKf5WS7h7+V+udPy10iG9kdb+/nRq+7Emtx+vhXceuyllKtDBKktzUu3AI0Bzc99aIR+Nm/kekxTaPzwfT6vxYIUwslarUNZohwrkom5oXtkTMAjX5mEH2jK+RbUUk5vKk6+DgYrr6vJCcM5J7igb7Mqs0m8y/B/w0MgkIX2eF5eSxzLnu8VDjTLlXjfA6jLPVvI3bKMkbvKK1Hg5Y3p4m6xmlDjem1NoYnWMALFJAYB+HgZLmNErAIP3jFve/gFStkDF1yPDaJLHuGYvCImDZkLj9ZbZ991JcyA0rwNBH/Z1bEbUBIPXoV0/3qtPYEhE5Mw2ww+b7Ftp9zJkSWWWVAq+WKKnSq0OH5vozI+mQY48YoDX9JOI46P7qk3A2hUQQfa+30psLZnC4H/BmI1mHbnr2mNsBFn0KvgUmRuzwlFKCSSJTZ2q1X68k6DE6BpmrDZzfRoC3hLyOwiG7EodLaW9YElqMC2vnd52YW/cQbyKfOslhnSIYVbivSo8h0Q2uuxHgy7Z+M+Xb5DMYuozn1NVu+e3Tmg899SZuA8SezW6NVWd0kX0MRzMs26B/u0N9wE+Z0adkm/xYCcBT5/RRXwgmMp7c1fJ1C8zsVQ3be9eEU1CmTcu6ATE/T9Ixx8MObFhnG9m4iRDDxSWqCacPl7OXHJw07r7c33/pKsZ71XnGyLQugEc4QsZUK22mibBw9xLJC47KjUqZjaCqeroY3CLX82eD12WOtllCUAFsSaXFQWwfZkzOoNT3/EzNVLGuBK88MgtCyc+CLLVFasHzgVpdWviwcOjZNnq4kWO3LRCF2r2NaJbnYSMaxiqZQEsNnwQe9l6AOBQwByO9rniYCyZhURrhfGv37fN6pXX9QkJn4RuNahhP3rC08xhdq+aRR/4J37kH8HMvoj96NE2+ztTbF5yKqlwyL+1nfdoh7QIfhirivAtnM8n4Ig== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2AZEgCXHVlf/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQEBgVdVX406klGSAgsBAQEBAQEBAQEjEQECBAEBhEuCFCU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig1IBIyOBPxKDJgGCVym1IoQQhHWBQoE2AgEBAQEBiCeFGYFBP4ERg06KNAS2aoJvgw2EXX6ROw8hoFaSUaFqgXpNIBg7gmkJRxkNjlaOEkIwNwIGCgEBAwlXAT0BjTIBAQ X-IPAS-Result: A2AZEgCXHVlf/xCltltfHAEBATwBAQQEAQECAQEHAQEcgUqBHCACAQEBgVdVX406klGSAgsBAQEBAQEBAQEjEQECBAEBhEuCFCU4EwIDAQEBAwIFAQEGAQEBAQEBBQQBhg9Fgjcig1IBIyOBPxKDJgGCVym1IoQQhHWBQoE2AgEBAQEBiCeFGYFBP4ERg06KNAS2aoJvgw2EXX6ROw8hoFaSUaFqgXpNIBg7gmkJRxkNjlaOEkIwNwIGCgEBAwlXAT0BjTIBAQ Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 09 Sep 2020 20:26:41 +0200 From: Fabian Frederick To: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, Fabian Frederick Subject: [PATCH 3/3 nf] selftests: netfilter: remove unused cnt and simplify command testing Date: Wed, 9 Sep 2020 20:26:24 +0200 Message-Id: <20200909182624.23834-1-fabf@skynet.be> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org cnt was not used in nft_meta.sh This patch also fixes 2 shellcheck SC2181 warnings: "check exit code directly with e.g. 'if mycmd;', not indirectly with $?." Signed-off-by: Fabian Frederick --- tools/testing/selftests/netfilter/nft_meta.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/netfilter/nft_meta.sh b/tools/testing/selftests/netfilter/nft_meta.sh index 1f5b46542c14c..18a1abca32629 100755 --- a/tools/testing/selftests/netfilter/nft_meta.sh +++ b/tools/testing/selftests/netfilter/nft_meta.sh @@ -7,8 +7,7 @@ ksft_skip=4 sfx=$(mktemp -u "XXXXXXXX") ns0="ns0-$sfx" -nft --version > /dev/null 2>&1 -if [ $? -ne 0 ];then +if ! nft --version > /dev/null 2>&1; then echo "SKIP: Could not run test without nft tool" exit $ksft_skip fi @@ -86,8 +85,7 @@ check_one_counter() local want="packets $2" local verbose="$3" - cnt=$(ip netns exec "$ns0" nft list counter inet filter $cname | grep -q "$want") - if [ $? -ne 0 ];then + if ! ip netns exec "$ns0" nft list counter inet filter $cname | grep -q "$want"; then echo "FAIL: $cname, want \"$want\", got" ret=1 ip netns exec "$ns0" nft list counter inet filter $cname