Skip to content

Commit

Permalink
selftests/bpf: fail test_tunnel.sh if subtests fail
Browse files Browse the repository at this point in the history
Right now test_tunnel.sh always exits with success even if some
of the subtests fail. Since the output is very verbose, it's
hard to spot the issues with subtests. Let's fail the script
if any subtest fails.

Signed-off-by: Stanislav Fomichev <sdf@google.com>
Acked-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  • Loading branch information
fomichev authored and borkmann committed May 28, 2019
1 parent 463910a commit 486d3f2
Showing 1 changed file with 32 additions and 0 deletions.
32 changes: 32 additions & 0 deletions tools/testing/selftests/bpf/test_tunnel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -696,30 +696,57 @@ check_err()

bpf_tunnel_test()
{
local errors=0

echo "Testing GRE tunnel..."
test_gre
errors=$(( $errors + $? ))

echo "Testing IP6GRE tunnel..."
test_ip6gre
errors=$(( $errors + $? ))

echo "Testing IP6GRETAP tunnel..."
test_ip6gretap
errors=$(( $errors + $? ))

echo "Testing ERSPAN tunnel..."
test_erspan v2
errors=$(( $errors + $? ))

echo "Testing IP6ERSPAN tunnel..."
test_ip6erspan v2
errors=$(( $errors + $? ))

echo "Testing VXLAN tunnel..."
test_vxlan
errors=$(( $errors + $? ))

echo "Testing IP6VXLAN tunnel..."
test_ip6vxlan
errors=$(( $errors + $? ))

echo "Testing GENEVE tunnel..."
test_geneve
errors=$(( $errors + $? ))

echo "Testing IP6GENEVE tunnel..."
test_ip6geneve
errors=$(( $errors + $? ))

echo "Testing IPIP tunnel..."
test_ipip
errors=$(( $errors + $? ))

echo "Testing IPIP6 tunnel..."
test_ipip6
errors=$(( $errors + $? ))

echo "Testing IPSec tunnel..."
test_xfrm_tunnel
errors=$(( $errors + $? ))

return $errors
}

trap cleanup 0 3 6
Expand All @@ -728,4 +755,9 @@ trap cleanup_exit 2 9
cleanup
bpf_tunnel_test

if [ $? -ne 0 ]; then
echo -e "$(basename $0): ${RED}FAIL${NC}"
exit 1
fi
echo -e "$(basename $0): ${GREEN}PASS${NC}"
exit 0

0 comments on commit 486d3f2

Please sign in to comment.