yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-25 19:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4134 from gilles-peskine-arm/ssl-opt-server-failure-2.16

Browse Source 
Backport 2.16: ssl-opt.sh: if the server fails, do treat it as a test failure
This commit is contained in:
Manuel Pégourié-Gonnard 2021-02-12 12:16:09 +01:00 committed by GitHub
commit 47e4035e98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/ssl-opt.sh
View File

@ -676,6 +676,7 @@ run_test() {
# terminate the server (and the proxy) # terminate the server (and the proxy)
kill $SRV_PID kill $SRV_PID
wait $SRV_PID wait $SRV_PID
SRV_RET=$?
if [ -n "$PXY_CMD" ]; then if [ -n "$PXY_CMD" ]; then
kill $PXY_PID >/dev/null 2>&1 kill $PXY_PID >/dev/null 2>&1
@ -709,9 +710,11 @@ run_test() {
fi fi
fi fi
# check server exit code # Check server exit code (only for Mbed TLS: GnuTLS and OpenSSL don't
if [ $? != 0 ]; then # exit with status 0 when interrupted by a signal, and we don't really
fail "server fail" # care anyway), in case e.g. the server reports a memory leak.
if [ $SRV_RET != 0 ] && is_polar "$SRV_CMD"; then
fail "Server exited with status $SRV_RET"
return return
fi fi