From e01af4cd37a5f3d6c4df5af5414e0139d71d45ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Tue, 25 Mar 2014 14:16:44 +0100
Subject: [PATCH] Tune compat.sh and ssl-opt.sh error reporting

---
 tests/compat.sh  | 8 ++++----
 tests/ssl-opt.sh | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/compat.sh b/tests/compat.sh
index 8e032af05b..b4af463454 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -679,8 +679,8 @@ run_client() {
     # announce what we're going to do
     let "tests++"
     VERIF=$(echo $VERIFY | tr '[:upper:]' '[:lower:]')
-    TITLE="${1:0:1}->${SERVER_NAME:0:1} $MODE,$VERIF $2 "
-    echo -n "$TITLE"
+    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 ' '
@@ -757,6 +757,8 @@ run_client() {
             ;;
     esac
 
+    echo "EXIT: $EXIT" >> cli_out
+
     # report and count result
     case $RESULT in
         "0")
@@ -768,8 +770,6 @@ run_client() {
             ;;
         "2")
             echo FAIL
-            echo "  ! $SERVER_CMD"
-            echo "  ! $CLIENT_CMD"
             cp srv_out c-srv-${tests}.log
             cp cli_out c-cli-${tests}.log
             echo "  ! outputs saved to c-srv-${tests}.log, c-cli-${tests}.log"
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 51e2e0b794..c0645b25d3 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -135,6 +135,8 @@ run_test() {
     echo "$CLI_CMD" > cli_out
     $SHELL -c "$CLI_CMD" >> cli_out 2>&1
     CLI_EXIT=$?
+    echo "EXIT: $CLI_EXIT" >> cli_out
+
     if is_polar "$SRV_CMD"; then
         "$P_CLI" request_page=SERVERQUIT tickets=0 auth_mode=none \
             crt_file=data_files/cli2.crt key_file=data_files/cli2.key \