Skip to content

Commit

Permalink
selftests: pmtu: Move running of test into a new function
Browse files Browse the repository at this point in the history
Move the block of code that runs a test and prints the verdict to a
new function, run_test.

Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David Ahern authored and David S. Miller committed Jun 10, 2019
1 parent 7bf4796 commit 243781d
Showing 1 changed file with 36 additions and 27 deletions.
63 changes: 36 additions & 27 deletions tools/testing/selftests/net/pmtu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,41 @@ test_cleanup_ipv4_exception() {
test_cleanup_vxlanX_exception 4
}

run_test() {
(
tname="$1"
tdesc="$2"

unset IFS

if [ "$VERBOSE" = "1" ]; then
printf "\n##########################################################################\n\n"
fi

eval test_${tname}
ret=$?

if [ $ret -eq 0 ]; then
printf "TEST: %-60s [ OK ]\n" "${tdesc}"
elif [ $ret -eq 1 ]; then
printf "TEST: %-60s [FAIL]\n" "${tdesc}"
if [ "${PAUSE_ON_FAIL}" = "yes" ]; then
echo
echo "Pausing. Hit enter to continue"
read a
fi
err_flush
exit 1
elif [ $ret -eq 2 ]; then
printf "TEST: %-60s [SKIP]\n" "${tdesc}"
err_flush
fi

return $ret
)
[ $? -ne 0 ] && exitcode=1
}

usage() {
echo
echo "$0 [OPTIONS] [TEST]..."
Expand Down Expand Up @@ -1147,33 +1182,7 @@ for t in ${tests}; do
done
[ $run_this -eq 0 ] && continue

(
unset IFS

if [ "$VERBOSE" = "1" ]; then
printf "\n##########################################################################\n\n"
fi

eval test_${name}
ret=$?

if [ $ret -eq 0 ]; then
printf "TEST: %-60s [ OK ]\n" "${t}"
elif [ $ret -eq 1 ]; then
printf "TEST: %-60s [FAIL]\n" "${t}"
if [ "${PAUSE_ON_FAIL}" = "yes" ]; then
echo
echo "Pausing. Hit enter to continue"
read a
fi
err_flush
exit 1
elif [ $ret -eq 2 ]; then
printf "TEST: %-60s [SKIP]\n" "${t}"
err_flush
fi
)
[ $? -ne 0 ] && exitcode=1
run_test "${name}" "${t}"
done

exit ${exitcode}

0 comments on commit 243781d

Please sign in to comment.