cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-03 20:22:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

ssl-opt.sh: wait for proxy to start before running the script further

Browse Source
This commit is contained in:
Unknown 2019-09-02 10:42:57 -04:00
parent 49fcbeab14
commit d364f4c7dd
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/ssl-opt.sh
View File

@ -426,9 +426,9 @@ has_mem_err() {
fi 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 if type lsof >/dev/null 2>/dev/null; then
wait_server_start() { wait_app_start() {
START_TIME=$(date +%s) START_TIME=$(date +%s)
if [ "$DTLS" -eq 1 ]; then if [ "$DTLS" -eq 1 ]; then
proto=UDP proto=UDP
@ -438,8 +438,8 @@ if type lsof >/dev/null 2>/dev/null; then
# Make a tight loop, server normally takes less than 1s to start. # 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 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 if [ $(( $(date +%s) - $START_TIME )) -gt $DOG_DELAY ]; then
echo "SERVERSTART TIMEOUT" echo "$3 START TIMEOUT"
echo "SERVERSTART TIMEOUT" >> $SRV_OUT echo "$3 START TIMEOUT" >> $4
break break
fi fi
# Linux and *BSD support decimal arguments to sleep. On other # Linux and *BSD support decimal arguments to sleep. On other
@ -448,12 +448,22 @@ if type lsof >/dev/null 2>/dev/null; then
done done
} }
else else
echo "Warning: lsof not available, wait_server_start = sleep" echo "Warning: lsof not available, wait_app_start = sleep"
wait_server_start() { wait_app_start() {
sleep "$START_DELAY" sleep "$START_DELAY"
} }
fi 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 # 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 # included in the first 4 bytes of the random bytes and check that it's within
# acceptable bounds # acceptable bounds
@ -610,7 +620,7 @@ run_test() {
echo "$PXY_CMD" > $PXY_OUT echo "$PXY_CMD" > $PXY_OUT
$PXY_CMD >> $PXY_OUT 2>&1 & $PXY_CMD >> $PXY_OUT 2>&1 &
PXY_PID=$! PXY_PID=$!
# assume proxy starts faster than server wait_proxy_start "$PXY_PORT" "$PXY_PID"
fi fi
check_osrv_dtls check_osrv_dtls