Date: Wed, 16 Dec 2015 00:19:20 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292302 - projects/zfsd/head/tests/sys/cddl/zfs/include Message-ID: <201512160019.tBG0JKJG049947@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Wed Dec 16 00:19:20 2015 New Revision: 292302 URL: https://svnweb.freebsd.org/changeset/base/292302 Log: tests/sys/cddl/zfs/include/logapi.kshlib Fix _endlog to print any error before calling any cleanup routines. This behavior confused me more than a few times, since it would appear that the cleanup routine itself failed rather than the test. Submitted by: Will Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib Wed Dec 16 00:17:20 2015 (r292301) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/logapi.kshlib Wed Dec 16 00:19:20 2015 (r292302) @@ -310,14 +310,14 @@ function _endlog _recursive_output $logfile export STF_EXITCODE=$1 + shift + (( ${#@} > 0 )) && _printline "$@" if [[ -n $_CLEANUP ]] ; then typeset cleanup=$_CLEANUP log_onexit "" log_note "Performing local cleanup via log_onexit ($cleanup)" $cleanup fi - shift - (( ${#@} > 0 )) && _printline "$@" exit $STF_EXITCODE }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512160019.tBG0JKJG049947>