[PATCH 1/2] report: put failure cdata collection in a helper fn

[David Disseldorp <ddiss@suse.de>]

xunit-quiet output omits all of this, so check for it once instead of
chaining "if [ -z "$quiet" -a ..." conditions.

Signed-off-by: David Disseldorp <ddiss@suse.de>
---
 common/report | 79 +++++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 37 deletions(-)

diff --git a/common/report b/common/report
index 2fa15e62..eff01a7f 100644
--- a/common/report
+++ b/common/report
@@ -162,6 +162,46 @@ ENDL
 	echo "Xunit report: $out_fn"
 }
 
+_xunit_log_failure_cdata()
+{
+	local report="$1"
+	local test_name="$2"
+	local full_file="${REPORT_DIR}/${test_name}.full"
+	local dmesg_file="${REPORT_DIR}/${test_name}.dmesg"
+	local out_src="${SRC_DIR}/${test_name}.out"
+	local outbad_file="${REPORT_DIR}/${test_name}.out.bad"
+	local mountfail_file="${REPORT_DIR}/${test_name}.mountfail"
+
+	if [ -s "$full_file" ]; then
+		echo -e "\t\t<system-out>" >> $report
+		printf	'<![CDATA[\n' >>$report
+		cat "$full_file" | tr -dc '[:print:][:space:]' | encode_cdata >>$report
+		printf ']]>\n'	>>$report
+		echo -e "\t\t</system-out>" >> $report
+	fi
+	if [ -f "$dmesg_file" ]; then
+		echo -e "\t\t<kernel-log>" >> $report
+		printf	'<![CDATA[\n' >>$report
+		cat "$dmesg_file" | tr -dc '[:print:][:space:]' | encode_cdata >>$report
+		printf ']]>\n'	>>$report
+		echo -e "\t\t</kernel-log>" >> $report
+	fi
+	if [ -s "$outbad_file" ]; then
+		echo -e "\t\t<system-err>" >> $report
+		printf	'<![CDATA[\n' >>$report
+		$diff "$out_src" "$outbad_file" | encode_cdata >>$report
+		printf ']]>\n'	>>$report
+		echo -e "\t\t</system-err>" >> $report
+	fi
+	if [ -f "$mountfail_file" ]; then
+		echo -e "\t\t<mount-failure>" >> $report
+		printf	'<![CDATA[\n' >>$report
+		cat "$mountfail_file" | tr -dc '[:print:][:space:]' | encode_cdata >>$report
+		printf ']]>\n'	>>$report
+		echo -e "\t\t</mount-failure>" >> $report
+	fi
+}
+
 _xunit_make_testcase_report()
 {
 	local sect_name="$1"
@@ -169,11 +209,6 @@ _xunit_make_testcase_report()
 	local test_status="$3"
 	local test_time="$4"
 	local report_format="$5"
-	local quiet
-
-	if [ "$report_format" = xunit-quiet ]; then
-		quiet=yes
-	fi
 
 	# TODO: other places may also win if no-section mode will be named like 'default/global'
 	if [ $sect_name == '-no-sections-' ]; then
@@ -198,42 +233,12 @@ _xunit_make_testcase_report()
 		echo -e "\t\t<skipped/>" >> $report
 		;;
 	"fail")
-		local out_src="${SRC_DIR}/${test_name}.out"
-		local full_file="${REPORT_DIR}/${test_name}.full"
-		local dmesg_file="${REPORT_DIR}/${test_name}.dmesg"
-		local mountfail_file="${REPORT_DIR}/${test_name}.mountfail"
-		local outbad_file="${REPORT_DIR}/${test_name}.out.bad"
 		if [ -z "$_err_msg" ]; then
 			_err_msg="Test $test_name failed, reason unknown"
 		fi
 		echo -e "\t\t<failure message=\"$_err_msg\" type=\"TestFail\" />" >> $report
-		if [ -z "$quiet" -a -s "$full_file" ]; then
-			echo -e "\t\t<system-out>" >> $report
-			printf	'<![CDATA[\n' >>$report
-			cat "$full_file" | tr -dc '[:print:][:space:]' | encode_cdata >>$report
-			printf ']]>\n'	>>$report
-			echo -e "\t\t</system-out>" >> $report
-		fi
-		if [ -z "$quiet" -a -f "$dmesg_file" ]; then
-			echo -e "\t\t<kernel-log>" >> $report
-			printf	'<![CDATA[\n' >>$report
-			cat "$dmesg_file" | tr -dc '[:print:][:space:]' | encode_cdata >>$report
-			printf ']]>\n'	>>$report
-			echo -e "\t\t</kernel-log>" >> $report
-		fi
-		if [ -z "$quiet" -a -s "$outbad_file" ]; then
-			echo -e "\t\t<system-err>" >> $report
-			printf	'<![CDATA[\n' >>$report
-			$diff "$out_src" "$outbad_file" | encode_cdata >>$report
-			printf ']]>\n'	>>$report
-			echo -e "\t\t</system-err>" >> $report
-		fi
-		if [ -z "$quiet" -a -f "$mountfail_file" ]; then
-			echo -e "\t\t<mount-failure>" >> $report
-			printf	'<![CDATA[\n' >>$report
-			cat "$mountfail_file" | tr -dc '[:print:][:space:]' | encode_cdata >>$report
-			printf ']]>\n'	>>$report
-			echo -e "\t\t</mount-failure>" >> $report
+		if [ "$report_format" != xunit-quiet ]; then
+			_xunit_log_failure_cdata "$report" "$test_name"
 		fi
 		;;
 	*)
-- 
2.55.0