X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftstunt%2Fgpg;h=4214b4a169f9ea632ac896bc282bf499bd9edebd;hb=dbee6afd429a8cf4136a040d95ea10fe3a38520e;hp=74152bd990670362e7e62f49cefe5068fede007b;hpb=ea47496f7dd4feac94f2a3a7f51fe1e07e012ee4;p=dgit.git

diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg
index 74152bd9..4214b4a1 100755
--- a/tests/tstunt/gpg
+++ b/tests/tstunt/gpg
@@ -3,4 +3,20 @@ set -e
 
 exec \
 with-lock-ex -w "$DGIT_TEST_GNUPG_GLOBAL_LOCK" \
-	$tmp "$DGIT_TEST_TROOT"/tstunt/gpg-withagent "$@"
+	sh -c '
+		"$@" 9>&2 2>>"$DGIT_TEST_GNUPG_LOG"
+		rc=$?
+		if [ $rc = 0 ]; then exit 0; fi
+		if [ "x$DGIT_TEST_BYHAND" != x ]; then
+			echo >&2 "BYHAND, not dumping $DGIT_TEST_GNUPG_LOG"
+		else
+			echo >&2 "########################################"
+			echo >&2 "$DGIT_TEST_GNUPG_LOG"
+			sed '\''s/^/\[gnupg-workarounds] /'\'' >&2 \
+				"$DGIT_TEST_GNUPG_LOG"
+			echo >&2 "end of $DGIT_TEST_GNUPG_LOG"
+			echo >&2 "########################################"
+		fi
+		exit $rc
+	' x \
+	"$DGIT_TEST_TROOT"/tstunt/gpg-withagent "$@"