From 754c7de1e91eeb28c6d3766900ead0c3e44fdb85 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 01:51:28 +0200 Subject: Merging upstream version 1:9.16.48. Signed-off-by: Daniel Baumann --- bin/tests/system/tools/tests.sh | 79 ++++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 37 deletions(-) (limited to 'bin/tests/system/tools') diff --git a/bin/tests/system/tools/tests.sh b/bin/tests/system/tools/tests.sh index 4ce73e1..ddf044c 100644 --- a/bin/tests/system/tools/tests.sh +++ b/bin/tests/system/tools/tests.sh @@ -17,32 +17,35 @@ SYSTEMTESTTOP=.. status=0 checkout() { - case $? in - 0) : ok ;; - *) echo_i "failed" - status=`expr $status + 1` - return 1 ;; - esac - case $out in - *$hash*) : ok ;; - *) echo_i "expect $hash" - echo_i "output $out" - echo_i "failed" - status=`expr $status + 1` ;; - esac + case $? in + 0) : ok ;; + *) + echo_i "failed" + status=$(expr $status + 1) + return 1 + ;; + esac + case $out in + *$hash*) : ok ;; + *) + echo_i "expect $hash" + echo_i "output $out" + echo_i "failed" + status=$(expr $status + 1) + ;; + esac } # test cases taken from RFC 5155 appendix A algo=1 flags=0 iters=12 salt="aabbccdd" -while read name hash -do - echo_i "checking $NSEC3HASH $name" - out=`$NSEC3HASH $salt $algo $iters $name` - checkout +while read name hash; do + echo_i "checking $NSEC3HASH $name" + out=$($NSEC3HASH $salt $algo $iters $name) + checkout - echo_i "checking $NSEC3HASH -r $name" - out=`$NSEC3HASH -r $algo $flags $iters $salt $name` - checkout + echo_i "checking $NSEC3HASH -r $name" + out=$($NSEC3HASH -r $algo $flags $iters $salt $name) + checkout done <&1` +out=$($NSEC3HASH 00 1 0 2>&1) checkfail echo_i "checking $NSEC3HASH extra args" -out=`$NSEC3HASH 00 1 0 two names 2>&1` +out=$($NSEC3HASH 00 1 0 two names 2>&1) checkfail echo_i "checking $NSEC3HASH bad option" -out=`$NSEC3HASH -? 2>&1` +out=$($NSEC3HASH -? 2>&1) checkfail echo_i "exit status: $status" -- cgit v1.2.3