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

This commit is contained in:
Gilles Peskine 2018-04-04 10:31:09 +02:00
commit 5c77f2ef37
2 changed files with 2 additions and 2 deletions

View File

@ -1087,7 +1087,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 " ! ==================================================="

View File

@ -231,7 +231,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 " ! ========================================================"