Skip to content

Commit 4fa1a7c

Browse files
author
Andras Fekete
committed
Fix the detection of the server PID
1 parent 6a95d6f commit 4fa1a7c

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

scripts/wp-cs-test.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ prepend() { # Usage: cmd 2>&1 | prepend "sometext "
3232

3333
kill_servers() {
3434
if [ $(check_process_running $OPENSSL_SERVER_PID) = "0" ]; then
35-
(kill -INT $OPENSSL_SERVER_PID) >/dev/null 2>&1
35+
(kill -9 $OPENSSL_SERVER_PID) >/dev/null 2>&1
3636
fi
3737
}
3838

@@ -143,13 +143,12 @@ generate_port() {
143143
}
144144

145145
start_openssl_server() { # usage: start_openssl_server [extraArgs]
146-
(stdbuf -oL -eL $OPENSSL_BIN s_server -www $1 \
146+
stdbuf -oL -eL $OPENSSL_BIN s_server -www $1 \
147147
-cert $CERT_DIR/server-cert.pem -key $CERT_DIR/server-key.pem \
148148
-dcert $CERT_DIR/server-ecc.pem -dkey $CERT_DIR/ecc-key.pem \
149149
-accept $OPENSSL_PORT $OPENSSL_ALL_CIPHERS \
150-
2>&1 | prepend "[server] " >>$LOG_FILE
151-
) &
152-
OPENSSL_SERVER_PID=$!
150+
2>&1 | prepend "[server] " >>$LOG_FILE &
151+
OPENSSL_SERVER_PID=$(($! - 1))
153152

154153
sleep 0.1
155154

0 commit comments

Comments
 (0)