Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

logapi: cat output file instead of printing 

This avoids globbing together multiple lines in the log, if you happen
to specify LOGAPI_DEBUG because you want to see it.

Signed-off-by:	Will Andrews <will@firepipe.net>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #11515
This commit is contained in:
Will Andrews 2020-10-11 15:08:56 -05:00 committed by Brian Behlendorf
parent a4134da2b2
commit de1a6cc387
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test-runner/include/logapi.shlib
View File

@ -105,7 +105,7 @@ function log_must_retry
" assertion failure exited $status" " assertion failure exited $status"
status=1 status=1
else else
[[ -n $LOGAPI_DEBUG ]] && print $($out) [[ -n $LOGAPI_DEBUG ]] && cat $logfile
_printsuccess "$@" _printsuccess "$@"
fi fi
break break
@ -244,7 +244,7 @@ function log_neg_expect
fi fi
if (( $ret == 0 )); then if (( $ret == 0 )); then
[[ -n $LOGAPI_DEBUG ]] && print $($out) [[ -n $LOGAPI_DEBUG ]] && cat $logfile
_printsuccess "$@" "exited $status" _printsuccess "$@" "exited $status"
fi fi
fi fi
@ -284,7 +284,7 @@ function log_pos
" exited $status" " exited $status"
status=1 status=1
else else
[[ -n $LOGAPI_DEBUG ]] && print $($out) [[ -n $LOGAPI_DEBUG ]] && cat $logfile
_printsuccess "$@" _printsuccess "$@"
fi fi
fi fi