yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-09 00:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/pr/1217' into mbedtls-1.3

Browse source 
* public/pr/1217:
  compat.sh: use wait_server_start
  wait_server_start: minor efficiency improvement
This commit is contained in:
Manuel Pégourié-Gonnard 2017-12-21 11:13:43 +01:00
parent 605c2284bc 103299edb7
commit a15a41ce48
2 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tests/compat.sh
View file

@ -764,6 +764,28 @@ has_mem_err() {
fi
}
# Wait for process $2 to be listening on port $1
if type lsof >/dev/null 2>/dev/null; then
wait_server_start() {
START_TIME=$(date +%s)
while ! lsof -a -n -b -i "TCP:$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
break
fi
# Linux and *BSD support decimal arguments to sleep. On other
# OSes this may be a tight loop.
sleep 0.1 2>/dev/null || true
done
}
else
wait_server_start() {
sleep 1
}
fi
# start_server <name>
# also saves name and command
start_server() {
@ -792,7 +814,7 @@ start_server() {
$SERVER_CMD >> $SRV_OUT 2>&1 &
PROCESS_ID=$!
sleep 1
wait_server_start "$PORT" "$PROCESS_ID"
}
# terminate the running server

39
tests/ssl-opt.sh
View file

@ -171,27 +171,26 @@ has_mem_err() {
fi
}
# wait for server to start: two versions depending on lsof availability
wait_server_start() {
if which lsof >/dev/null 2>&1; then
START_TIME=$( date +%s )
DONE=0
# make a tight loop, server usually takes less than 1 sec to start
while [ $DONE -eq 0 ]; do
if lsof -nbi TCP:"$PORT" 2>/dev/null | grep LISTEN >/dev/null
then
DONE=1
elif [ $(( $( date +%s ) - $START_TIME )) -gt $DOG_DELAY ]; then
echo "SERVERSTART TIMEOUT"
echo "SERVERSTART TIMEOUT" >> $SRV_OUT
DONE=1
fi
# Wait for process $2 to be listening on port $1
if type lsof >/dev/null 2>/dev/null; then
wait_server_start() {
START_TIME=$(date +%s)
while ! lsof -a -n -b -i "TCP:$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
break
fi
# Linux and *BSD support decimal arguments to sleep. On other
# OSes this may be a tight loop.
sleep 0.1 2>/dev/null || true
done
else
}
else
wait_server_start() {
sleep "$START_DELAY"
fi
}
}
fi
# wait for client to terminate and set CLI_EXIT
# must be called right after starting the client
@ -254,7 +253,7 @@ run_test() {
echo "$SRV_CMD" > $SRV_OUT
$SRV_CMD >> $SRV_OUT 2>&1 &
SRV_PID=$!
wait_server_start
wait_server_start "$PORT" "$SRV_PID"
echo "$CLI_CMD" > $CLI_OUT
eval "$CLI_CMD" >> $CLI_OUT 2>&1 &