diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 3ff4e61729..4ef8aec718 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -286,6 +286,24 @@ digcomp() { # Useful functions in test scripts # +# assert_int_equal: compare two integer variables, $1 and $2 +# +# If $1 and $2 are equal, return 0; if $1 and $2 are not equal, report +# the error using the description of the tested variable provided in $3 +# and return 1. +assert_int_equal() { + expected="$1" + found="$2" + description="$3" + + if [ "${expected}" -ne "${found}" ]; then + echo_i "incorrect ${description}: expected ${expected}, got ${found}" + return 1 + fi + + return 0 +} + # keyfile_to_keys_section: helper function for keyfile_to_*_keys() which # converts keyfile data into a configuration section using the supplied # parameters diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32 index 527a5c8768..b38c82fce5 100644 --- a/bin/tests/system/conf.sh.win32 +++ b/bin/tests/system/conf.sh.win32 @@ -258,6 +258,24 @@ digcomp() { # Useful functions in test scripts # +# assert_int_equal: compare two integer variables, $1 and $2 +# +# If $1 and $2 are equal, return 0; if $1 and $2 are not equal, report +# the error using the description of the tested variable provided in $3 +# and return 1. +assert_int_equal() { + expected="$1" + found="$2" + description="$3" + + if [ "${expected}" -ne "${found}" ]; then + echo_i "incorrect ${description}: expected ${expected}, got ${found}" + return 1 + fi + + return 0 +} + # keyfile_to_keys_section: helper function for keyfile_to_*_keys() which # converts keyfile data into a configuration section using the supplied # parameters diff --git a/bin/tests/system/tcp/tests.sh b/bin/tests/system/tcp/tests.sh index df9a4b6ed2..86eafcba3c 100644 --- a/bin/tests/system/tcp/tests.sh +++ b/bin/tests/system/tcp/tests.sh @@ -98,7 +98,7 @@ n=$((n + 1)) echo_i "TCP high-water: check initial statistics ($n)" ret=0 refresh_tcp_stats -assert_int_equal "${TCP_CUR}" 1 "current TCP clients count" +assert_int_equal "${TCP_CUR}" 1 "current TCP clients count" || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -111,8 +111,8 @@ OLD_TCP_CUR="${TCP_CUR}" TCP_ADDED=9 open_connections "${TCP_ADDED}" refresh_tcp_stats -assert_int_equal "${TCP_CUR}" $((OLD_TCP_CUR + TCP_ADDED)) "current TCP clients count" -assert_int_equal "${TCP_HIGH}" $((OLD_TCP_CUR + TCP_ADDED)) "TCP high-water value" +assert_int_equal "${TCP_CUR}" $((OLD_TCP_CUR + TCP_ADDED)) "current TCP clients count" || ret=1 +assert_int_equal "${TCP_HIGH}" $((OLD_TCP_CUR + TCP_ADDED)) "TCP high-water value" || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -126,8 +126,8 @@ OLD_TCP_HIGH="${TCP_HIGH}" TCP_REMOVED=5 close_connections "${TCP_REMOVED}" refresh_tcp_stats -assert_int_equal "${TCP_CUR}" $((OLD_TCP_CUR - TCP_REMOVED)) "current TCP clients count" -assert_int_equal "${TCP_HIGH}" "${OLD_TCP_HIGH}" "TCP high-water value" +assert_int_equal "${TCP_CUR}" $((OLD_TCP_CUR - TCP_REMOVED)) "current TCP clients count" || ret=1 +assert_int_equal "${TCP_HIGH}" "${OLD_TCP_HIGH}" "TCP high-water value" || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -138,8 +138,8 @@ echo_i "TCP high-water: ensure tcp-clients is an upper bound ($n)" ret=0 open_connections $((TCP_LIMIT + 1)) refresh_tcp_stats -assert_int_equal "${TCP_CUR}" "${TCP_LIMIT}" "current TCP clients count" -assert_int_equal "${TCP_HIGH}" "${TCP_LIMIT}" "TCP high-water value" +assert_int_equal "${TCP_CUR}" "${TCP_LIMIT}" "current TCP clients count" || ret=1 +assert_int_equal "${TCP_HIGH}" "${TCP_LIMIT}" "TCP high-water value" || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret`