commit 452f6ba1a6daec92f0e86692dfc2e0b1b0218fb1
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Dec 17 11:06:50 2013 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Dec 17 11:26:59 2013 +0100
tree 2189878fc53cf0c44ac13c552124830d615c5257
parent c72ac7c3ef9b3012131e8a4a5d67aa8123364369

compat.sh cleanups

tests/compat.sh

diff --git a/tests/compat.sh b/tests/compat.sh
index 83f28fc..21ea484 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -260,7 +260,8 @@
 
         P_SERVER_ARGS="$P_SERVER_BASE psk=6162636465666768696a6b6c6d6e6f70"
         P_CLIENT_ARGS="$P_CLIENT_BASE psk=6162636465666768696a6b6c6d6e6f70"
-        O_SERVER_ARGS="$O_SERVER_BASE -psk 6162636465666768696a6b6c6d6e6f70"
+        # openssl s_server won't start without certificates...
+        O_SERVER_ARGS="$O_SERVER_BASE -psk 6162636465666768696a6b6c6d6e6f70 -cert data_files/server1.crt -key data_files/server1.key"
         O_CLIENT_ARGS="$O_CLIENT_BASE -psk 6162636465666768696a6b6c6d6e6f70"
 
         P_CIPHERS="                                 \
@@ -289,8 +290,8 @@
 fi
 
 
-log "$OPENSSL s_server -cert data_files/server2.crt -key data_files/server2.key -www -quiet -cipher NULL,ALL $O_SERVER_ARGS -$MODE"
-$OPENSSL s_server -cert data_files/server2.crt -key data_files/server2.key -www -quiet -cipher NULL,ALL $O_SERVER_ARGS -$MODE >/dev/null 2>&1 &
+log "$OPENSSL s_server -www -quiet -cipher NULL,ALL $O_SERVER_ARGS -$MODE"
+$OPENSSL s_server -www -quiet -cipher NULL,ALL $O_SERVER_ARGS -$MODE >/dev/null 2>&1 &
 PROCESS_ID=$!
 
 sleep 1
@@ -309,6 +310,8 @@
     elif [ "$EXIT" != "0" ];
     then
         echo Failed
+        echo "$OPENSSL s_server -www -quiet -cipher NULL,ALL $O_SERVER_ARGS -$MODE"
+        echo "ssl_client2 force_ciphersuite=$i force_version=$MODE $P_CLIENT_ARGS"
         echo $RESULT
         let "failed++"
     else
@@ -341,8 +344,8 @@
             let "skipped++"
         else
             echo Failed
-            echo ../programs/ssl/ssl_server2 $P_SERVER_ARGS 
-            echo $OPENSSL s_client -$MODE -cipher $i $O_CLIENT_ARGS 
+            echo "ssl_server2 $P_SERVER_ARGS force_version=$MODE"
+            echo "$OPENSSL s_client -$MODE -cipher $i $O_CLIENT_ARGS"
             echo $RESULT
             let "failed++"
         fi
@@ -499,6 +502,8 @@
     elif [ "$EXIT" != "0" ];
     then
         echo Failed
+        echo "ssl_server2 $P_SERVER_ARGS"
+        echo "ssl_client2 force_ciphersuite=$i force_version=$MODE $P_CLIENT_ARGS"
         echo $RESULT
         let "failed++"
     else