Merge branch 'development' into dtls
* development:
Fix previous commit
Allow flexible location of valgrind
Fix test scripts portability issues
Fix Gnu-ism in script
Conflicts:
tests/ssl-opt.sh
diff --git a/tests/compat.sh b/tests/compat.sh
index f451299..8e0fa4f 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -56,16 +56,16 @@
print_usage() {
echo "Usage: $0"
- echo -e " -h|--help\tPrint this help."
- echo -e " -f|--filter\tOnly matching ciphersuites are tested (Default: '$FILTER')"
- echo -e " -e|--exclude\tMatching ciphersuites are excluded (Default: '$EXCLUDE')"
- echo -e " -m|--modes\tWhich modes to perform (Default: '$MODES')"
- echo -e " -t|--types\tWhich key exchange type to perform (Default: '$TYPES')"
- echo -e " -V|--verify\tWhich verification modes to perform (Default: '$VERIFIES')"
- echo -e " -p|--peers\tWhich peers to use (Default: '$PEERS')"
- echo -e " \tAlso available: GnuTLS (needs v3.2.15 or higher)"
- echo -e " -M|--memcheck\tCheck memory leaks and errors."
- echo -e " -v|--verbose\tSet verbose output."
+ printf " -h|--help\tPrint this help.\n"
+ printf " -f|--filter\tOnly matching ciphersuites are tested (Default: '$FILTER')\n"
+ printf " -e|--exclude\tMatching ciphersuites are excluded (Default: '$EXCLUDE')\n"
+ printf " -m|--modes\tWhich modes to perform (Default: '$MODES')\n"
+ printf " -t|--types\tWhich key exchange type to perform (Default: '$TYPES')\n"
+ printf " -V|--verify\tWhich verification modes to perform (Default: '$VERIFIES')\n"
+ printf " -p|--peers\tWhich peers to use (Default: '$PEERS')\n"
+ printf " \tAlso available: GnuTLS (needs v3.2.15 or higher)\n"
+ printf " -M|--memcheck\tCheck memory leaks and errors.\n"
+ printf " -v|--verbose\tSet verbose output.\n"
}
get_options() {
@@ -166,7 +166,7 @@
done
# 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/ $//'
}
# OpenSSL 1.0.1h with -Verify wants a ClientCertificate message even for
@@ -923,9 +923,9 @@
VERIF=$(echo $VERIFY | tr '[:upper:]' '[:lower:]')
TITLE="`echo $1 | head -c1`->`echo $SERVER_NAME | head -c1`"
TITLE="$TITLE $MODE,$VERIF $2"
- echo -n "$TITLE "
+ printf "$TITLE "
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 ' '
# should we skip?
if [ "X$SKIP_NEXT" = "XYES" ]; then
@@ -1201,9 +1201,9 @@
if [ $FAILED -ne 0 -o $SRVMEM -ne 0 ];
then
- echo -n "FAILED"
+ printf "FAILED"
else
- echo -n "PASSED"
+ printf "PASSED"
fi
if [ "$MEMCHECK" -gt 0 ]; then
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 38ea628..14cd9cf 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -44,7 +44,7 @@
{
make clean
- find -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+
+ find . -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+
rm -f include/Makefile include/polarssl/Makefile programs/*/Makefile
git update-index --no-skip-worktree Makefile library/Makefile programs/Makefile tests/Makefile
git checkout -- Makefile library/Makefile programs/Makefile tests/Makefile
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index b594c3e..f8c536d 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -35,10 +35,10 @@
print_usage() {
echo "Usage: $0 [options]"
- echo -e " -h|--help\tPrint this help."
- echo -e " -m|--memcheck\tCheck memory leaks and errors."
- echo -e " -f|--filter\tOnly matching tests are executed (default: '$FILTER')"
- echo -e " -e|--exclude\tMatching tests are excluded (default: '$EXCLUDE')"
+ printf " -h|--help\tPrint this help.\n"
+ printf " -m|--memcheck\tCheck memory leaks and errors.\n"
+ printf " -f|--filter\tOnly matching tests are executed (default: '$FILTER')\n"
+ printf " -e|--exclude\tMatching tests are excluded (default: '$EXCLUDE')\n"
}
get_options() {
@@ -145,10 +145,10 @@
# print_name <name>
print_name() {
- echo -n "$1 "
+ printf "$1 "
LEN=$(( 72 - `echo "$1" | wc -c` ))
- for i in `seq 1 $LEN`; do echo -n '.'; done
- echo -n ' '
+ for i in `seq 1 $LEN`; do printf '.'; done
+ printf ' '
TESTS=$(( $TESTS + 1 ))
}
@@ -229,9 +229,11 @@
# make a tight loop, server usually takes less than 1 sec to start
if [ "$DTLS" -eq 1 ]; then
- until lsof -nbi UDP:"$SRV_PORT" | grep UDP >/dev/null; do :; done
+ until lsof -nbi UDP:"$SRV_PORT" 2>/dev/null | grep UDP >/dev/null;
+ do :; done
else
- until lsof -nbi TCP:"$SRV_PORT" | grep LISTEN >/dev/null; do :; done
+ until lsof -nbi TCP:"$SRV_PORT" 2>/dev/null | grep LISTEN >/dev/null;
+ do :; done
fi
kill $DOG_PID >/dev/null 2>&1
@@ -2782,9 +2784,9 @@
echo "------------------------------------------------------------------------"
if [ $FAILS = 0 ]; then
- echo -n "PASSED"
+ printf "PASSED"
else
- echo -n "FAILED"
+ printf "FAILED"
fi
PASSES=$(( $TESTS - $FAILS ))
echo " ($PASSES / $TESTS tests ($SKIPS skipped))"