Print fail messages before callbacks in test suite

Reorder operations in _endlog so failure messages get
printed prior to performing callbacks and cleanup. This
helps clarify why a test failed and places the message
closer to the point of incident in the resulting logs.

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Giuseppe Di Natale <[email protected]>
Closes #6281 

1 files changed, 6 insertions, 4 deletions

diff --git a/tests/test-runner/include/logapi.shlib b/tests/test-runner/include/logapi.shlib
index d9f276e0e..fabfc42b1 100644
--- a/tests/test-runner/include/logapi.shlib
+++ b/tests/test-runner/include/logapi.shlib
@@ -418,7 +418,11 @@ function _endlog
 	typeset logfile="/tmp/log.$$"
 	_recursive_output $logfile
 
-	if [[ $1 == $STF_FAIL ]] ; then
+	typeset exitcode=$1
+	shift
+	(( ${#@} > 0 )) && _printline "$@"
+
+	if [[ $exitcode == $STF_FAIL ]] ; then
 		_execute_testfail_callbacks
 	fi
 
@@ -428,9 +432,7 @@ function _endlog
 		log_note "Performing local cleanup via log_onexit ($cleanup)"
 		$cleanup
 	fi
-	typeset exitcode=$1
-	shift
-	(( ${#@} > 0 )) && _printline "$@"
+
 	exit $exitcode
 }