commit 8066b81a548fab373df68adb02a4436bc91bb565
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 28 22:59:30 2014 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu May 29 11:57:43 2014 +0200
tree 775fcf8f17258ce394a9639dec4a81a7f5dfa8f3
parent 1ebc0c592c835e32d51a2fab731342edd8257432

Pick a "unique" port in SSL test scripts

tests/compat.sh

diff --git a/tests/compat.sh b/tests/compat.sh
index 724311c..1eea23c 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -645,14 +645,14 @@
             exit 1;
     esac
 
-    P_SERVER_ARGS="server_addr=0.0.0.0 force_version=$MODE"
-    O_SERVER_ARGS="-www -cipher NULL,ALL -$MODE"
-    G_SERVER_ARGS="-p 4433 --http"
+    P_SERVER_ARGS="server_port=$PORT server_addr=0.0.0.0 force_version=$MODE"
+    O_SERVER_ARGS="-accept $PORT -www -cipher NULL,ALL -$MODE"
+    G_SERVER_ARGS="-p $PORT --http"
     G_SERVER_PRIO="EXPORT:+NULL:+MD5:+PSK:+DHE-PSK:+ECDHE-PSK:+RSA-PSK:-VERS-TLS-ALL:$G_PRIO_MODE"
 
-    P_CLIENT_ARGS="force_version=$MODE"
-    O_CLIENT_ARGS="-$MODE"
-    G_CLIENT_ARGS="-p 4433 --debug 3"
+    P_CLIENT_ARGS="server_port=$PORT force_version=$MODE"
+    O_CLIENT_ARGS="-connect localhost:$PORT -$MODE"
+    G_CLIENT_ARGS="-p $PORT --debug 3"
     G_CLIENT_PRIO="NONE:$G_PRIO_MODE:+COMP-NULL:+CURVE-ALL:+SIGN-ALL"
 
     if [ "X$VERIFY" = "XYES" ];
@@ -952,7 +952,10 @@
     esac
 done
 
-killall -q gnutls-serv openssl ssl_server ssl_server2
+# Pick a "unique" port in the range 10000-19999.
+PORT="0000$$"
+PORT="1$(echo $PORT | tail -c 4)"
+
 trap cleanup INT TERM HUP
 
 for VERIFY in $VERIFIES; do