test suite: gpg agent workaround: Fix bugs in log neatening.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 3f363e42dda9172909667050dfae315eb187758e..852adc76ae5fea3271464ba6afe63d8c8bea50bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dgit (5.5+exp9) experimental; urgency=medium
+
+  * test suite: gpg agent workaround: Fix bugs in log neatening.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jun 2018 19:03:00 +0100
+
 dgit (5.5+exp8) experimental; urgency=medium
 
   * test suite: gpg agent workaround: Neaten the logging.

diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg
index 7e12846c46470a1418d7b53a6f49b33018555dbb..4214b4a169f9ea632ac896bc282bf499bd9edebd 100755 (executable)
--- a/tests/tstunt/gpg
+++ b/tests/tstunt/gpg
@@ -6,14 +6,16 @@ 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 [ $rc = 0 ]; then exit 0; fi
                if [ "x$DGIT_TEST_BYHAND" != x ]; then
-                       echo >&2 "BYHAND, not catting $DGIT_TEST_GNUPG_LOG"
+                       echo >&2 "BYHAND, not dumping $DGIT_TEST_GNUPG_LOG"
                else
                        echo >&2 "########################################"
                        echo >&2 "$DGIT_TEST_GNUPG_LOG"
-                       cat >&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 \