All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net,
	edumazet@google.com, parav@nvidia.com, mst@redhat.com,
	jasowang@redhat.com, xuanzhuo@linux.alibaba.com,
	shuah@kernel.org, petrm@nvidia.com, liuhangbin@gmail.com,
	vladimir.oltean@nxp.com, bpoirier@nvidia.com, idosch@nvidia.com,
	virtualization@lists.linux.dev
Subject: [patch net-next v3 2/6] selftests: forwarding: move couple of initial check to the beginning
Date: Wed, 17 Apr 2024 18:45:50 +0200	[thread overview]
Message-ID: <20240417164554.3651321-3-jiri@resnulli.us> (raw)
In-Reply-To: <20240417164554.3651321-1-jiri@resnulli.us>

From: Jiri Pirko <jiri@nvidia.com>

These two check can be done at he very beginning of the script.
As the follow up patch needs to add early code that needs to be executed
after the checks, move them.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
 tools/testing/selftests/net/forwarding/lib.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 7913c6ee418d..2e7695b94b6b 100644
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -84,6 +84,16 @@ declare -A NETIFS=(
 # e.g. a low-power board.
 : "${KSFT_MACHINE_SLOW:=no}"
 
+if [[ "$(id -u)" -ne 0 ]]; then
+	echo "SKIP: need root privileges"
+	exit $ksft_skip
+fi
+
+if [[ ! -v NUM_NETIFS ]]; then
+	echo "SKIP: importer does not define \"NUM_NETIFS\""
+	exit $ksft_skip
+fi
+
 net_forwarding_dir=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")
 
 if [[ -f $net_forwarding_dir/forwarding.config ]]; then
@@ -241,11 +251,6 @@ check_port_mab_support()
 	fi
 }
 
-if [[ "$(id -u)" -ne 0 ]]; then
-	echo "SKIP: need root privileges"
-	exit $ksft_skip
-fi
-
 if [[ "$CHECK_TC" = "yes" ]]; then
 	check_tc_version
 fi
-- 
2.44.0


  parent reply	other threads:[~2024-04-17 16:46 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-17 16:45 [patch net-next v3 0/6] selftests: virtio_net: introduce initial testing infrastructure Jiri Pirko
2024-04-17 16:45 ` [patch net-next v3 1/6] virtio: add debugfs infrastructure to allow to debug virtio features Jiri Pirko
2024-04-17 16:45 ` Jiri Pirko [this message]
2024-04-17 18:58   ` [patch net-next v3 2/6] selftests: forwarding: move couple of initial check to the beginning Benjamin Poirier
2024-04-18  6:16     ` Jiri Pirko
2024-04-17 16:45 ` [patch net-next v3 3/6] selftests: forwarding: add ability to assemble NETIFS array by driver name Jiri Pirko
2024-04-18  8:11   ` Petr Machata
2024-04-18  8:43     ` Petr Machata
2024-04-18 12:01       ` Jiri Pirko
2024-04-18 12:14     ` Jiri Pirko
2024-04-17 16:45 ` [patch net-next v3 4/6] selftests: forwarding: add check_driver() helper Jiri Pirko
2024-04-18  8:31   ` Petr Machata
2024-04-17 16:45 ` [patch net-next v3 5/6] selftests: forwarding: add wait_for_dev() helper Jiri Pirko
2024-04-18  8:33   ` Petr Machata
2024-04-18 12:01     ` Jiri Pirko
2024-04-17 16:45 ` [patch net-next v3 6/6] selftests: virtio_net: add initial tests Jiri Pirko
2024-04-18  8:39   ` Petr Machata
2024-04-18 12:00     ` Jiri Pirko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240417164554.3651321-3-jiri@resnulli.us \
    --to=jiri@resnulli.us \
    --cc=bpoirier@nvidia.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=idosch@nvidia.com \
    --cc=jasowang@redhat.com \
    --cc=kuba@kernel.org \
    --cc=liuhangbin@gmail.com \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=parav@nvidia.com \
    --cc=petrm@nvidia.com \
    --cc=shuah@kernel.org \
    --cc=virtualization@lists.linux.dev \
    --cc=vladimir.oltean@nxp.com \
    --cc=xuanzhuo@linux.alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.