test suite: gpg agent workaround: Neaten the logging.

[dgit.git] / tests / tstunt / gpg

diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg
index 79d8319929719c46777e841c54c54bbd654c9591..7e12846c46470a1418d7b53a6f49b33018555dbb 100755 (executable)
--- a/tests/tstunt/gpg
+++ b/tests/tstunt/gpg
@@ -3,4 +3,18 @@ set -e
 
 exec \
 with-lock-ex -w "$DGIT_TEST_GNUPG_GLOBAL_LOCK" \
+       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 catting $DGIT_TEST_GNUPG_LOG"
+               else
+                       echo >&2 "########################################"
+                       echo >&2 "$DGIT_TEST_GNUPG_LOG"
+                       cat >&2 "$DGIT_TEST_GNUPG_LOG"
+                       echo >&2 "end of $DGIT_TEST_GNUPG_LOG"
+               fi
+               exit $rc
+       ' x \
        "$DGIT_TEST_TROOT"/tstunt/gpg-withagent "$@"