diff options
| author | David S. Miller <davem@davemloft.net> | 2021-10-25 12:59:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-25 12:59:25 +0100 |
| commit | 2d7e73f09fc2f5d968ca375f047718cf25ae2b92 (patch) | |
| tree | 6091f03456ecea6d6eda5bbf064af911df649768 /tools/testing/selftests/net/forwarding/lib.sh | |
| parent | Merge tag 'linux-can-next-for-5.16-20211024' of git://git.kernel.org/pub/scm/... (diff) | |
| download | linux-2d7e73f09fc2f5d968ca375f047718cf25ae2b92.tar.gz linux-2d7e73f09fc2f5d968ca375f047718cf25ae2b92.zip | |
Revert "Merge branch 'dsa-rtnl'"
This reverts commit 965e6b262f48257dbdb51b565ecfd84877a0ab5f, reversing
changes made to 4d98bb0d7ec2d0b417df6207b0bafe1868bad9f8.
Diffstat (limited to 'tools/testing/selftests/net/forwarding/lib.sh')
| -rw-r--r-- | tools/testing/selftests/net/forwarding/lib.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 520d8b53464b..92087d423bcf 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -23,8 +23,6 @@ MC_CLI=${MC_CLI:=smcroutectl} PING_TIMEOUT=${PING_TIMEOUT:=5} WAIT_TIMEOUT=${WAIT_TIMEOUT:=20} INTERFACE_TIMEOUT=${INTERFACE_TIMEOUT:=600} -REQUIRE_JQ=${REQUIRE_JQ:=yes} -REQUIRE_MZ=${REQUIRE_MZ:=yes} relative_path="${BASH_SOURCE%/*}" if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then @@ -143,12 +141,8 @@ require_command() fi } -if [[ "$REQUIRE_JQ" = "yes" ]]; then - require_command jq -fi -if [[ "$REQUIRE_MZ" = "yes" ]]; then - require_command $MZ -fi +require_command jq +require_command $MZ if [[ ! -v NUM_NETIFS ]]; then echo "SKIP: importer does not define \"NUM_NETIFS\"" |