From: David Ahern <dsah...@gmail.com>

Move the block of code that runs a test and prints the verdict to a
new function, run_test.

Signed-off-by: David Ahern <dsah...@gmail.com>
---
 tools/testing/selftests/net/pmtu.sh | 63 +++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/tools/testing/selftests/net/pmtu.sh 
b/tools/testing/selftests/net/pmtu.sh
index 4a1275990d7e..3d6b21c4b1db 100755
--- a/tools/testing/selftests/net/pmtu.sh
+++ b/tools/testing/selftests/net/pmtu.sh
@@ -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]..."
@@ -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}
-- 
2.11.0

Reply via email to