yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix test scripts portability issues

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-12-11 11:51:28 +01:00
parent 76c99a01a1
commit f46f128f4a
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tests/compat.sh
View file

@ -51,16 +51,16 @@ PEERS="OpenSSL$PEER_GNUTLS PolarSSL"
print_usage() { print_usage() {
echo "Usage: $0" echo "Usage: $0"
echo -e " -h|--help\tPrint this help." printf " -h|--help\tPrint this help.\n"
echo -e " -f|--filter\tOnly matching ciphersuites are tested (Default: '$FILTER')" printf " -f|--filter\tOnly matching ciphersuites are tested (Default: '$FILTER')\n"
echo -e " -e|--exclude\tMatching ciphersuites are excluded (Default: '$EXCLUDE')" printf " -e|--exclude\tMatching ciphersuites are excluded (Default: '$EXCLUDE')\n"
echo -e " -m|--modes\tWhich modes to perform (Default: '$MODES')" printf " -m|--modes\tWhich modes to perform (Default: '$MODES')\n"
echo -e " -t|--types\tWhich key exchange type to perform (Default: '$TYPES')" printf " -t|--types\tWhich key exchange type to perform (Default: '$TYPES')\n"
echo -e " -V|--verify\tWhich verification modes to perform (Default: '$VERIFIES')" printf " -V|--verify\tWhich verification modes to perform (Default: '$VERIFIES')\n"
echo -e " -p|--peers\tWhich peers to use (Default: '$PEERS')" printf " -p|--peers\tWhich peers to use (Default: '$PEERS')\n"
echo -e " \tAlso available: GnuTLS (needs v3.2.15 or higher)" printf " \tAlso available: GnuTLS (needs v3.2.15 or higher)\n"
echo -e " -M|--memcheck\tCheck memory leaks and errors." printf " -M|--memcheck\tCheck memory leaks and errors.\n"
echo -e " -v|--verbose\tSet verbose output." printf " -v|--verbose\tSet verbose output.\n"
} }
get_options() { get_options() {
@ -121,7 +121,7 @@ filter()
done done
# normalize whitespace # normalize whitespace
echo "$NEW_LIST" | sed -e 's/[[:space:]]\+/ /g' -e 's/^ //' -e 's/ $//' echo "$NEW_LIST" | sed -e 's/[[:space:]][[:space:]]*/ /g' -e 's/^ //' -e 's/ $//'
} }
filter_ciphersuites() filter_ciphersuites()
@ -834,9 +834,9 @@ run_client() {
VERIF=$(echo $VERIFY | tr '[:upper:]' '[:lower:]') VERIF=$(echo $VERIFY | tr '[:upper:]' '[:lower:]')
TITLE="`echo $1 | head -c1`->`echo $SERVER_NAME | head -c1`" TITLE="`echo $1 | head -c1`->`echo $SERVER_NAME | head -c1`"
TITLE="$TITLE $MODE,$VERIF $2" TITLE="$TITLE $MODE,$VERIF $2"
echo -n "$TITLE " printf "$TITLE "
LEN=$(( 72 - `echo "$TITLE" | wc -c` )) LEN=$(( 72 - `echo "$TITLE" | wc -c` ))
for i in `seq 1 $LEN`; do echo -n '.'; done; echo -n ' ' for i in `seq 1 $LEN`; do printf '.'; done; printf ' '
# run the command and interpret result # run the command and interpret result
case $1 in case $1 in
@ -1095,9 +1095,9 @@ echo "------------------------------------------------------------------------"
if [ $FAILED -ne 0 -o $SRVMEM -ne 0 ]; if [ $FAILED -ne 0 -o $SRVMEM -ne 0 ];
then then
echo -n "FAILED" printf "FAILED"
else else
echo -n "PASSED" printf "PASSED"
fi fi
if [ "$MEMCHECK" -gt 0 ]; then if [ "$MEMCHECK" -gt 0 ]; then

21
tests/ssl-opt.sh
View file

@ -34,10 +34,10 @@ EXCLUDE='^$'
print_usage() { print_usage() {
echo "Usage: $0 [options]" echo "Usage: $0 [options]"
echo -e " -h|--help\tPrint this help." printf " -h|--help\tPrint this help.\n"
echo -e " -m|--memcheck\tCheck memory leaks and errors." printf " -m|--memcheck\tCheck memory leaks and errors.\n"
echo -e " -f|--filter\tOnly matching tests are executed (default: '$FILTER')" printf " -f|--filter\tOnly matching tests are executed (default: '$FILTER')\n"
echo -e " -e|--exclude\tMatching tests are excluded (default: '$EXCLUDE')" printf " -e|--exclude\tMatching tests are excluded (default: '$EXCLUDE')\n"
} }
get_options() { get_options() {
@ -96,10 +96,10 @@ requires_gnutls() {
# print_name <name> # print_name <name>
print_name() { print_name() {
echo -n "$1 " printf "$1 "
LEN=$(( 72 - `echo "$1" | wc -c` )) LEN=$(( 72 - `echo "$1" | wc -c` ))
for i in `seq 1 $LEN`; do echo -n '.'; done for i in `seq 1 $LEN`; do printf '.'; done
echo -n ' ' printf ' '
TESTS=$(( $TESTS + 1 )) TESTS=$(( $TESTS + 1 ))
} }
@ -148,7 +148,8 @@ wait_server_start() {
WATCHDOG_PID=$! WATCHDOG_PID=$!
# make a tight loop, server usually takes less than 1 sec to start # make a tight loop, server usually takes less than 1 sec to start
until lsof -nbi TCP:"$PORT" | grep LISTEN >/dev/null; do :; done until lsof -nbi TCP:"$PORT" 2>/dev/null | grep LISTEN >/dev/null;
do :; done
kill $WATCHDOG_PID kill $WATCHDOG_PID
wait $WATCHDOG_PID wait $WATCHDOG_PID
@ -1848,9 +1849,9 @@ run_test "Large packet TLS 1.2 AEAD shorter tag" \
echo "------------------------------------------------------------------------" echo "------------------------------------------------------------------------"
if [ $FAILS = 0 ]; then if [ $FAILS = 0 ]; then
echo -n "PASSED" printf "PASSED"
else else
echo -n "FAILED" printf "FAILED"
fi fi
PASSES=$(( $TESTS - $FAILS )) PASSES=$(( $TESTS - $FAILS ))
echo " ($PASSES / $TESTS tests ($SKIPS skipped))" echo " ($PASSES / $TESTS tests ($SKIPS skipped))"