From 9afdc83d77a41ac3e1919b37448a3d935d18e4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Tue, 4 Aug 2015 17:15:13 +0200
Subject: [PATCH] Fix bashisms in test scripts

---
 tests/compat.sh               | 4 ++--
 tests/scripts/all.sh          | 2 +-
 tests/scripts/check-names.sh  | 4 ++--
 tests/scripts/list-symbols.sh | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/compat.sh b/tests/compat.sh
index 541b550b2..4b43e33a5 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -945,7 +945,7 @@ run_client() {
             CLIENT_CMD="$OPENSSL_CMD s_client $O_CLIENT_ARGS -cipher $2"
             log "$CLIENT_CMD"
             echo "$CLIENT_CMD" > $CLI_OUT
-            ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD >> $CLI_OUT 2>&1 &
+            printf 'GET HTTP/1.0\r\n\r\n' | $CLIENT_CMD >> $CLI_OUT 2>&1 &
             wait_client_done
 
             if [ $EXIT -eq 0 ]; then
@@ -969,7 +969,7 @@ run_client() {
             CLIENT_CMD="$GNUTLS_CLI $G_CLIENT_ARGS --priority $G_PRIO_MODE:$2 $G_HOST"
             log "$CLIENT_CMD"
             echo "$CLIENT_CMD" > $CLI_OUT
-            ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD >> $CLI_OUT 2>&1 &
+            printf 'GET HTTP/1.0\r\n\r\n' | $CLIENT_CMD >> $CLI_OUT 2>&1 &
             wait_client_done
 
             if [ $EXIT -eq 0 ]; then
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 7faeb1137..14abd2d9a 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -270,7 +270,7 @@ CC=clang cmake -D CMAKE_BUILD_TYPE:String=Release .
 make
 
 msg "test: main suites valgrind (Release)"
-make test
+make memcheck
 
 # Optional part(s)
 # Currently broken, programs don't seem to receive signals
diff --git a/tests/scripts/check-names.sh b/tests/scripts/check-names.sh
index 2bf53c7dd..ed65306a0 100755
--- a/tests/scripts/check-names.sh
+++ b/tests/scripts/check-names.sh
@@ -11,7 +11,7 @@ FAIL=0
 
 printf "Exported symbols declared in header: "
 UNDECLARED=$( diff exported-symbols identifiers | sed -n -e 's/^< //p' )
-if [ "x$UNDECLARED" == "x" ]; then
+if [ "x$UNDECLARED" = "x" ]; then
     echo "PASS"
 else
     echo "FAIL"
@@ -58,7 +58,7 @@ sed -n 's/MBED..._[A-Z0-9_]*/\'"$NL"'&\'"$NL"/gp \
 TYPOS=$( diff _caps _MBEDTLS_XXX | sed -n 's/^> //p' \
             | egrep -v 'XXX|__|_$|^MBEDTLS_CONFIG_FILE$' || true )
 rm _MBEDTLS_XXX _caps
-if [ "x$TYPOS" == "x" ]; then
+if [ "x$TYPOS" = "x" ]; then
     echo "PASS"
 else
     echo "FAIL"
diff --git a/tests/scripts/list-symbols.sh b/tests/scripts/list-symbols.sh
index ad3f84202..82b6cc90b 100755
--- a/tests/scripts/list-symbols.sh
+++ b/tests/scripts/list-symbols.sh
@@ -12,10 +12,10 @@ if grep -i cmake Makefile >/dev/null; then
     exit 1
 fi
 
-cp include/mbedtls/config.h{,.bak}
+cp include/mbedtls/config.h include/mbedtls/config.h.bak
 scripts/config.pl full
 CFLAGS=-fno-asynchronous-unwind-tables make clean lib >/dev/null 2>&1
-mv include/mbedtls/config.h{.bak,}
+mv include/mbedtls/config.h.bak include/mbedtls/config.h
 nm -gUj library/libmbedtls.a 2>/dev/null | sed -n -e 's/^_//p' | sort > exported-symbols
 make clean