From: Alex Bennée <alex.bennee@linaro.org>
Date: Fri, 5 Jul 2019 11:56:35 +0000 (+0100)
Subject: tests/tcg: fix diff-out pass to properly report failure
X-Git-Tag: v4.1.0-rc1~15^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef860047b61ea4a5ad407496ab8cda6370a2d7d8;p=thirdparty%2Fqemu.git

tests/tcg: fix diff-out pass to properly report failure

A side effect of piping the output to head is squash the exit status
of the diff command. Fix this by only doing the pipe if the diff
failed and then ensuring the status is non-zero.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---

diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile
index 6fa63cc8d53..9f567686240 100644
--- a/tests/tcg/Makefile
+++ b/tests/tcg/Makefile
@@ -45,7 +45,11 @@ run-test = $(call quiet-command, timeout $(TIMEOUT) $2,"TEST",$3)
 endif
 
 # $1 = test name, $2 = reference
-diff-out = $(call quiet-command, diff -u $1.out $2 | head -n 10,"DIFF","$1.out with $2")
+# to work around the pipe squashing the status we only pipe the result if
+# we know it failed and then force failure at the end.
+diff-out = $(call quiet-command, diff -q $1.out $2 || \
+                                 (diff -u $1.out $2 | head -n 10 && false), \
+                                 "DIFF","$1.out with $2")
 
 # $1 = test name, $2 = reason
 skip-test = @printf "  SKIPPED %s on $(TARGET_NAME) because %s\n" $1 $2