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

Merge pull request #3404 from mpg/improve-ssl-opt-logs

Browse Source 
Improve ssl-opt.sh logs
This commit is contained in:
Manuel Pégourié-Gonnard 2020-08-17 12:04:36 +02:00 committed by GitHub
commit 98944cd756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/compat.sh
View File

@ -1232,7 +1232,7 @@ run_client() {
cp $CLI_OUT c-cli-${TESTS}.log cp $CLI_OUT c-cli-${TESTS}.log
echo " ! outputs saved to c-srv-${TESTS}.log, c-cli-${TESTS}.log" echo " ! outputs saved to c-srv-${TESTS}.log, c-cli-${TESTS}.log"
if [ "X${USER:-}" = Xbuildbot -o "X${LOGNAME:-}" = Xbuildbot -o "${LOG_FAILURE_ON_STDOUT:-0}" != 0 ]; then if [ "${LOG_FAILURE_ON_STDOUT:-0}" != 0 ]; then
echo " ! server output:" echo " ! server output:"
cat c-srv-${TESTS}.log cat c-srv-${TESTS}.log
echo " ! ===================================================" echo " ! ==================================================="

24
tests/ssl-opt.sh
View File

@ -445,7 +445,7 @@ fail() {
fi fi
echo " ! outputs saved to o-XXX-${TESTS}.log" echo " ! outputs saved to o-XXX-${TESTS}.log"
if [ "X${USER:-}" = Xbuildbot -o "X${LOGNAME:-}" = Xbuildbot -o "${LOG_FAILURE_ON_STDOUT:-0}" != 0 ]; then if [ "${LOG_FAILURE_ON_STDOUT:-0}" != 0 ]; then
echo " ! server output:" echo " ! server output:"
cat o-srv-${TESTS}.log cat o-srv-${TESTS}.log
echo " ! ========================================================" echo " ! ========================================================"
@ -697,6 +697,19 @@ run_test() {
return return
fi fi
# update DTLS variable
detect_dtls "$SRV_CMD"
# if the test uses DTLS but no custom proxy, add a simple proxy
# as it provides timing info that's useful to debug failures
if [ -z "$PXY_CMD" ] && [ "$DTLS" -eq 1 ]; then
PXY_CMD="$P_PXY"
case " $SRV_CMD " in
*' server_addr=::1 '*)
PXY_CMD="$PXY_CMD server_addr=::1 listen_addr=::1";;
esac
fi
# fix client port # fix client port
if [ -n "$PXY_CMD" ]; then if [ -n "$PXY_CMD" ]; then
CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$PXY_PORT/g ) CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$PXY_PORT/g )
@ -704,9 +717,6 @@ run_test() {
CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$SRV_PORT/g ) CLI_CMD=$( echo "$CLI_CMD" | sed s/+SRV_PORT/$SRV_PORT/g )
fi fi
# update DTLS variable
detect_dtls "$SRV_CMD"
# prepend valgrind to our commands if active # prepend valgrind to our commands if active
if [ "$MEMCHECK" -gt 0 ]; then if [ "$MEMCHECK" -gt 0 ]; then
if is_polar "$SRV_CMD"; then if is_polar "$SRV_CMD"; then
@ -723,19 +733,19 @@ run_test() {
# run the commands # run the commands
if [ -n "$PXY_CMD" ]; then if [ -n "$PXY_CMD" ]; then
echo "$PXY_CMD" > $PXY_OUT printf "# %s\n%s\n" "$NAME" "$PXY_CMD" > $PXY_OUT
$PXY_CMD >> $PXY_OUT 2>&1 & $PXY_CMD >> $PXY_OUT 2>&1 &
PXY_PID=$! PXY_PID=$!
wait_proxy_start "$PXY_PORT" "$PXY_PID" wait_proxy_start "$PXY_PORT" "$PXY_PID"
fi fi
check_osrv_dtls check_osrv_dtls
echo "$SRV_CMD" > $SRV_OUT printf "# $NAME\n$SRV_CMD\n" > $SRV_OUT
provide_input | $SRV_CMD >> $SRV_OUT 2>&1 & provide_input | $SRV_CMD >> $SRV_OUT 2>&1 &
SRV_PID=$! SRV_PID=$!
wait_server_start "$SRV_PORT" "$SRV_PID" wait_server_start "$SRV_PORT" "$SRV_PID"
echo "$CLI_CMD" > $CLI_OUT printf "# $NAME\n$CLI_CMD\n" > $CLI_OUT
eval "$CLI_CMD" >> $CLI_OUT 2>&1 & eval "$CLI_CMD" >> $CLI_OUT 2>&1 &
wait_client_done wait_client_done