|
 |
e965a0 |
From 94c83310182228dcb959f390c6a513cbdebe4976 Mon Sep 17 00:00:00 2001
|
|
|
e965a0 |
From: Dalibor Pospisil <dapospis@redhat.com>
|
|
|
e965a0 |
Date: Fri, 2 Feb 2018 15:13:46 +0100
|
|
|
e965a0 |
Subject: [PATCH 3/5] move final summary printing to rlJournalEnd
|
|
|
e965a0 |
|
|
|
e965a0 |
also put the text to journal.txt
|
|
|
e965a0 |
this will ensure the summary is always printed at the end and is also present in the text file
|
|
|
e965a0 |
---
|
|
|
e965a0 |
src/journal.sh | 11 ++++++-----
|
|
|
e965a0 |
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
e965a0 |
|
|
|
e965a0 |
diff --git a/src/journal.sh b/src/journal.sh
|
|
|
e965a0 |
index 04e4a10..867d08f 100644
|
|
|
e965a0 |
--- a/src/journal.sh
|
|
|
e965a0 |
+++ b/src/journal.sh
|
|
|
e965a0 |
@@ -242,6 +242,8 @@ rlJournalEnd(){
|
|
|
e965a0 |
__INTERNAL_ENDTIME=$__INTERNAL_TIMESTAMP
|
|
|
e965a0 |
__INTERNAL_update_journal_txt
|
|
|
e965a0 |
|
|
|
e965a0 |
+ __INTERNAL_PrintHeadLog "${__INTERNAL_TEST_NAME}" 2>&1
|
|
|
e965a0 |
+
|
|
|
e965a0 |
if [ -n "$TESTID" ] ; then
|
|
|
e965a0 |
__INTERNAL_JournalXMLCreate
|
|
|
e965a0 |
$BEAKERLIB_COMMAND_SUBMIT_LOG -T $TESTID -l $__INTERNAL_BEAKERLIB_JOURNAL \
|
|
|
e965a0 |
@@ -252,6 +254,10 @@ rlJournalEnd(){
|
|
|
e965a0 |
fi
|
|
|
e965a0 |
|
|
|
e965a0 |
echo "#End of metafile" >> $__INTERNAL_BEAKERLIB_METAFILE
|
|
|
e965a0 |
+
|
|
|
e965a0 |
+ __INTERNAL_LogText "Phases: $__INTERNAL_PHASES_PASSED good, $__INTERNAL_PHASES_FAILED bad" LOG 2>&1
|
|
|
e965a0 |
+ __INTERNAL_LogText "RESULT: $__INTERNAL_TEST_NAME" $__INTERNAL_PHASES_WORST_RESULT 2>&1
|
|
|
e965a0 |
+
|
|
|
e965a0 |
__INTERNAL_JournalXMLCreate
|
|
|
e965a0 |
__INTERNAL_TestResultsSave
|
|
|
e965a0 |
}
|
|
|
e965a0 |
@@ -434,11 +440,6 @@ rlJournalPrintText(){
|
|
|
e965a0 |
[[ -t 1 ]] && textfile="$__INTERNAL_BEAKERLIB_JOURNAL_COLORED" || textfile="$__INTERNAL_BEAKERLIB_JOURNAL_TXT"
|
|
|
e965a0 |
cat "$textfile"
|
|
|
e965a0 |
|
|
|
e965a0 |
- local __INTERNAL_LogText_no_file=1
|
|
|
e965a0 |
- __INTERNAL_PrintHeadLog "${__INTERNAL_TEST_NAME}" 2>&1
|
|
|
e965a0 |
- __INTERNAL_LogText "Phases: $__INTERNAL_PHASES_PASSED good, $__INTERNAL_PHASES_FAILED bad" LOG 2>&1
|
|
|
e965a0 |
- __INTERNAL_LogText "RESULT: $__INTERNAL_TEST_NAME" $__INTERNAL_PHASES_WORST_RESULT 2>&1
|
|
|
e965a0 |
-
|
|
|
e965a0 |
return 0
|
|
|
e965a0 |
}
|
|
|
e965a0 |
|
|
|
e965a0 |
--
|
|
|
e965a0 |
2.14.3
|