mirror of
https://github.com/yuzu-emu/mbedtls
synced 2024-11-24 09:28:24 +00:00
ssl-opt.sh: wait for proxy to start before running the script further
This commit is contained in:
parent
fe1d66d3e2
commit
43dc0d6a8f
1 changed files with 17 additions and 7 deletions
|
@ -420,9 +420,9 @@ has_mem_err() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Wait for process $2 to be listening on port $1
|
||||
# Wait for process $2 named $3 to be listening on port $1. Print error to $4.
|
||||
if type lsof >/dev/null 2>/dev/null; then
|
||||
wait_server_start() {
|
||||
wait_app_start() {
|
||||
START_TIME=$(date +%s)
|
||||
if [ "$DTLS" -eq 1 ]; then
|
||||
proto=UDP
|
||||
|
@ -432,8 +432,8 @@ if type lsof >/dev/null 2>/dev/null; then
|
|||
# Make a tight loop, server normally takes less than 1s to start.
|
||||
while ! lsof -a -n -b -i "$proto:$1" -p "$2" >/dev/null 2>/dev/null; do
|
||||
if [ $(( $(date +%s) - $START_TIME )) -gt $DOG_DELAY ]; then
|
||||
echo "SERVERSTART TIMEOUT"
|
||||
echo "SERVERSTART TIMEOUT" >> $SRV_OUT
|
||||
echo "$3 START TIMEOUT"
|
||||
echo "$3 START TIMEOUT" >> $4
|
||||
break
|
||||
fi
|
||||
# Linux and *BSD support decimal arguments to sleep. On other
|
||||
|
@ -442,12 +442,22 @@ if type lsof >/dev/null 2>/dev/null; then
|
|||
done
|
||||
}
|
||||
else
|
||||
echo "Warning: lsof not available, wait_server_start = sleep"
|
||||
wait_server_start() {
|
||||
echo "Warning: lsof not available, wait_app_start = sleep"
|
||||
wait_app_start() {
|
||||
sleep "$START_DELAY"
|
||||
}
|
||||
fi
|
||||
|
||||
# Wait for server process $2 to be listening on port $1.
|
||||
wait_server_start() {
|
||||
wait_app_start $1 $2 "SERVER" $SRV_OUT
|
||||
}
|
||||
|
||||
# Wait for proxy process $2 to be listening on port $1.
|
||||
wait_proxy_start() {
|
||||
wait_app_start $1 $2 "PROXY" $PXY_OUT
|
||||
}
|
||||
|
||||
# Given the client or server debug output, parse the unix timestamp that is
|
||||
# included in the first 4 bytes of the random bytes and check that it's within
|
||||
# acceptable bounds
|
||||
|
@ -600,7 +610,7 @@ run_test() {
|
|||
echo "$PXY_CMD" > $PXY_OUT
|
||||
$PXY_CMD >> $PXY_OUT 2>&1 &
|
||||
PXY_PID=$!
|
||||
# assume proxy starts faster than server
|
||||
wait_proxy_start "$PXY_PORT" "$PXY_PID"
|
||||
fi
|
||||
|
||||
check_osrv_dtls
|
||||
|
|
Loading…
Reference in a new issue