diff options
| author |   David Ahern <dsahern@gmail.com> | 2019-08-09 16:13:38 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-08-09 19:54:14 -0700 |
| commit | f887427b2cecfb57165f0207b33aed89dd29ab61 (patch) | |
| tree | bb9e67e4c0b86c7b0103906787b3be148c3ff1a2 /tools | |
| parent | Merge branch 'hns3-next' (diff) | |
| download | linux-dev-f887427b2cecfb57165f0207b33aed89dd29ab61.tar.xz linux-dev-f887427b2cecfb57165f0207b33aed89dd29ab61.zip | |
selftests: Fix detection of nettest command in fcnal-test
Most of the tests run by fcnal-test.sh relies on the nettest command.
Rather than trying to cover all of the individual tests, check for the
binary only at the beginning.
Also removes the need for log_error which is undefined.
Fixes: 6f9d5cacfe07 ("selftests: Setup for functional tests for fib and socket lookups")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/testing/selftests/net/fcnal-test.sh | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/tools/testing/selftests/net/fcnal-test.sh b/tools/testing/selftests/net/fcnal-test.sh index bd6b564382ec..9fd3a0b97f0d 100755 --- a/tools/testing/selftests/net/fcnal-test.sh +++ b/tools/testing/selftests/net/fcnal-test.sh @@ -998,13 +998,6 @@ ipv4_tcp_vrf() ipv4_tcp() { log_section "IPv4/TCP" - - which nettest >/dev/null - if [ $? -ne 0 ]; then - log_error "nettest not found; skipping tests" - return - fi - log_subsection "No VRF" setup @@ -1375,12 +1368,6 @@ ipv4_udp_vrf() ipv4_udp() { - which nettest >/dev/null - if [ $? -ne 0 ]; then - log_error "nettest not found; skipping tests" - return - fi - log_section "IPv4/UDP" log_subsection "No VRF" @@ -2314,13 +2301,6 @@ ipv6_tcp_vrf() ipv6_tcp() { log_section "IPv6/TCP" - - which nettest >/dev/null - if [ $? -ne 0 ]; then - log_error "nettest not found; skipping tests" - return - fi - log_subsection "No VRF" setup @@ -3156,12 +3136,6 @@ netfilter_icmp() ipv4_netfilter() { - which nettest >/dev/null - if [ $? -ne 0 ]; then - log_error "nettest not found; skipping tests" - return - fi - log_section "IPv4 Netfilter" log_subsection "TCP reset" @@ -3219,12 +3193,6 @@ netfilter_icmp6() ipv6_netfilter() { - which nettest >/dev/null - if [ $? -ne 0 ]; then - log_error "nettest not found; skipping tests" - return - fi - log_section "IPv6 Netfilter" log_subsection "TCP reset" @@ -3422,6 +3390,12 @@ elif [ "$TESTS" = "ipv6" ]; then TESTS="$TESTS_IPV6" fi +which nettest >/dev/null +if [ $? -ne 0 ]; then + echo "'nettest' command not found; skipping tests" + exit 0 +fi + declare -i nfail=0 declare -i nsuccess=0 |