mirrors-yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls synced 2024-11-24 13:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream-public/pr/1286' into development

Browse source
This commit is contained in:
Jaeden Amero 2018-01-29 12:48:54 +00:00
commit b2534a10b7
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/compat.sh
View file

@ -887,8 +887,9 @@ if type lsof >/dev/null 2>/dev/null; then
done done
} }
else else
echo "Warning: lsof not available, wait_server_start = sleep"
wait_server_start() { wait_server_start() {
sleep 1 sleep 2
} }
fi fi

25
tests/ssl-opt.sh
View file

@ -308,6 +308,7 @@ if type lsof >/dev/null 2>/dev/null; then
done done
} }
else else
echo "Warning: lsof not available, wait_server_start = sleep $START_DELAY"
wait_server_start() { wait_server_start() {
sleep "$START_DELAY" sleep "$START_DELAY"
} }
@ -656,14 +657,28 @@ fi
# used by watchdog # used by watchdog
MAIN_PID="$$" MAIN_PID="$$"
# be more patient with valgrind # We use somewhat arbitrary delays for tests:
# - how long do we wait for the server to start (when lsof not available)?
# - how long do we allow for the client to finish?
# (not to check performance, just to avoid waiting indefinitely)
# Things are slower with valgrind, so give extra time here.
#
# Note: without lsof, there is a trade-off between the running time of this
# script and the risk of spurious errors because we didn't wait long enough.
# The watchdog delay on the other hand doesn't affect normal running time of
# the script, only the case where a client or server gets stuck.
if [ "$MEMCHECK" -gt 0 ]; then if [ "$MEMCHECK" -gt 0 ]; then
START_DELAY=3 START_DELAY=6
DOG_DELAY=30 DOG_DELAY=60
else else
START_DELAY=1 START_DELAY=2
DOG_DELAY=10 DOG_DELAY=20
fi fi
# some particular tests need more time:
# - for the client, we multiply the usual watchdog limit by a factor
# - for the server, we sleep for a number of seconds after the client exits
# see client_need_more_time() and server_needs_more_time()
CLI_DELAY_FACTOR=1 CLI_DELAY_FACTOR=1
SRV_DELAY_SECONDS=0 SRV_DELAY_SECONDS=0