compat.sh and ssl-opt.sh cosmetics
- do not print '0 memory errors' when memcheck was not used
- add commands to the log files
diff --git a/tests/compat.sh b/tests/compat.sh
index d1ae994..7fa8587 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -626,7 +626,8 @@
SERVER_NAME=$1
log "$SERVER_CMD"
- $SERVER_CMD >srv_out 2>&1 &
+ echo "$SERVER_CMD" > srv_out
+ $SERVER_CMD >> srv_out 2>&1 &
PROCESS_ID=$!
sleep 1
@@ -683,7 +684,8 @@
[Oo]pen*)
CLIENT_CMD="$OPENSSL s_client $O_CLIENT_ARGS -cipher $2"
log "$CLIENT_CMD"
- ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD > cli_out 2>&1
+ echo "$CLIENT_CMD" > cli_out
+ ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD >> cli_out 2>&1
EXIT=$?
if [ "$EXIT" == "0" ]; then
@@ -700,7 +702,8 @@
[Gg]nu*)
CLIENT_CMD="gnutls-cli $G_CLIENT_ARGS --priority $G_PRIO_MODE:$2 localhost"
log "$CLIENT_CMD"
- ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD > cli_out 2>&1
+ echo "$CLIENT_CMD" > cli_out
+ ( echo -e 'GET HTTP/1.0'; echo; ) | $CLIENT_CMD >> cli_out 2>&1
EXIT=$?
if [ "$EXIT" == "0" ]; then
@@ -724,7 +727,8 @@
CLIENT_CMD="valgrind --leak-check=full $CLIENT_CMD"
fi
log "$CLIENT_CMD"
- $CLIENT_CMD > cli_out 2>&1
+ echo "$CLIENT_CMD" > cli_out
+ $CLIENT_CMD >> cli_out 2>&1
EXIT=$?
case $EXIT in
@@ -884,8 +888,14 @@
echo -n "PASSED"
fi
+if [ "$MEMCHECK" -gt 0 ]; then
+ MEMREPORT=", $srvmem server memory errors"
+else
+ MEMREPORT=""
+fi
+
let "passed = tests - failed"
-echo " ($passed / $tests tests ($skipped skipped, $srvmem server memory errors)"
+echo " ($passed / $tests tests ($skipped skipped$MEMREPORT))"
let "failed += srvmem"
exit $failed