compat.sh cosmetics

This commit is contained in:
Manuel Pégourié-Gonnard 2014-02-24 13:20:14 +01:00
parent 720375e7ea
commit 4145b89091
2 changed files with 15 additions and 16 deletions

View file

@ -447,8 +447,6 @@ setup_arguments()
# start_server <name> # start_server <name>
# also saves name and command # also saves name and command
start_server() { start_server() {
echo "-----------"
case $1 in case $1 in
[Oo]pen*) [Oo]pen*)
SERVER_CMD="$OPENSSL s_server $O_SERVER_ARGS" SERVER_CMD="$OPENSSL s_server $O_SERVER_ARGS"
@ -526,20 +524,26 @@ run_client() {
# report and count result # report and count result
let "tests++" let "tests++"
echo -n "$SERVER_NAME Server - $1 Client - $2 : $EXIT - " VERIF=$(echo $VERIFY | tr '[:upper:]' '[:lower:]')
TITLE="${1:0:1}->${SERVER_NAME:0:1} $MODE,$VERIF $2 "
echo -n "$TITLE"
LEN=`echo "$TITLE" | wc -c`
LEN=`echo 72 - $LEN | bc`
for i in `seq 1 $LEN`; do echo -n '.'; done; echo -n ' '
case $RESULT in case $RESULT in
"0") "0")
echo Success echo PASS
;; ;;
"1") "1")
echo "Ciphersuite not supported" echo SKIP
let "skipped++" let "skipped++"
;; ;;
"2") "2")
echo Failed echo FAIL
echo "$SERVER_CMD" echo " ! $SERVER_CMD"
echo "$CLIENT_CMD" echo " ! $CLIENT_CMD"
echo "$OUTPUT" echo -n " ! ... "
echo "$OUTPUT" | tail -c72
let "failed++" let "failed++"
;; ;;
esac esac
@ -547,8 +551,6 @@ run_client() {
for VERIFY in $VERIFIES; do for VERIFY in $VERIFIES; do
for MODE in $MODES; do for MODE in $MODES; do
echo "-----------"
echo "Running for $MODE (Verify: $VERIFY)"
for TYPE in $TYPES; do for TYPE in $TYPES; do
setup_arguments setup_arguments
@ -568,7 +570,6 @@ for VERIFY in $VERIFIES; do
run_client OpenSSL $i run_client OpenSSL $i
done done
echo "-----------"
add_polarssl_ciphersuites add_polarssl_ciphersuites
for i in $P_CIPHERS; do for i in $P_CIPHERS; do
@ -581,9 +582,7 @@ for VERIFY in $VERIFIES; do
done done
done done
echo "" echo "------------------------------------------------------------------------"
echo "-------------------------------------------------------------------------"
echo ""
if (( failed != 0 )); if (( failed != 0 ));
then then

View file

@ -471,6 +471,6 @@ else
echo -n "FAILED" echo -n "FAILED"
fi fi
PASSES=`echo $TESTS - $FAILS | bc` PASSES=`echo $TESTS - $FAILS | bc`
echo " ($PASSES / $TESTS)" echo " ($PASSES / $TESTS tests)"
exit $FAILS exit $FAILS