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/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index f4fbc01..4df999e 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -153,7 +153,7 @@
 
     # psk is useful when server only has bad certs
     if is_polar "$SRV_CMD"; then
-        "$P_CLI" request_page=SERVERQUIT tickets=0 auth_mode=none psk=abc123 \
+        $P_CLI request_page=SERVERQUIT tickets=0 auth_mode=none psk=abc123 \
             crt_file=data_files/cli2.crt key_file=data_files/cli2.key \
             >/dev/null
     else
@@ -276,7 +276,16 @@
     exit 1
 fi
 
-killall -q openssl ssl_server ssl_server2
+# Pick a "unique" port in the range 10000-19999.
+PORT="0000$$"
+PORT="1$(echo $PORT | tail -c 4)"
+
+# fix commands to use this port
+P_SRV="$P_SRV server_port=$PORT"
+P_CLI="$P_CLI server_port=$PORT"
+O_SRV="$O_SRV -accept $PORT"
+O_CLI="$O_CLI -connect localhost:$PORT"
+
 trap cleanup INT TERM HUP
 
 # Test for SSLv2 ClientHello