From: Andreas Henriksson <andreas@fatal.se>
Date: Wed, 30 Jul 2014 12:28:17 +0000 (+0200)
Subject: verbose-tests
X-Git-Tag: archive/raspbian/2.40.2-8+rpi1~1^2^2^2^2^2^2^2^2^2^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=29a6d46548d835e2dafcf0e4f09ff0b279d5bd7f;p=util-linux.git

verbose-tests

Enable verbose tests and print content of failing tests output file.

Gbp-Pq: Topic debian
Gbp-Pq: Name verbose-tests.patch
---

diff --git a/tests/Makemodule.am b/tests/Makemodule.am
index d5422be..a3462fb 100644
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -13,7 +13,7 @@ clean-local-tests:
 
 CLEAN_LOCALS += clean-local-tests
 
-TESTS_OPTIONS = --nonroot --show-diff
+TESTS_OPTIONS = --nonroot --show-diff --verbose --parallel=1
 TESTS_PARALLEL = --parallel
 TESTS_COMMAND = $(top_srcdir)/tests/run.sh \
 	--srcdir=$(abs_top_srcdir) \
diff --git a/tests/functions.sh b/tests/functions.sh
index 5a562a3..493c1d7 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -183,6 +183,17 @@ function ts_failed_subtest {
 		ts_report " $msg ($1)"
 	fi
 
+	if [ "$TS_VERBOSE" = "yes" ]; then
+		echo ========= script: $TS_SCRIPT =================
+		echo ================= OUTPUT =====================
+		cat -n $TS_OUTPUT
+		echo ================= EXPECTED ===================
+		cat -n $TS_EXPECTED
+		echo ================= O/E diff ===================
+		diff -u $TS_OUTPUT $TS_EXPECTED
+		echo ==============================================
+	fi
+
 	return $ret
 }