mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-01-08 08:35:38 +00:00
Merge remote-tracking branch 'upstream-public/pr/1553' into mbedtls-2.1-proposed
This commit is contained in:
commit
0f34b06a4d
|
@ -1072,7 +1072,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 ]; then
|
if [ "X${USER:-}" = Xbuildbot -o "X${LOGNAME:-}" = Xbuildbot -o "${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 " ! ==================================================="
|
||||||
|
|
|
@ -177,7 +177,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 ]; then
|
if [ "X${USER:-}" = Xbuildbot -o "X${LOGNAME:-}" = Xbuildbot -o "${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 " ! ========================================================"
|
||||||
|
|
Loading…
Reference in a new issue