test suite: gpg agent workaround: Neaten the logging.

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

diff --git a/debian/changelog b/debian/changelog
index 36118450faa6a3a45f065287a5e7298b9787fe7d..3f363e42dda9172909667050dfae315eb187758e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dgit (5.5+exp8) experimental; urgency=medium
+
+  * test suite: gpg agent workaround: Neaten the logging.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jun 2018 10:54:48 +0100
+
 dgit (5.5+exp7) experimental; urgency=medium
 
   * test suite: gpg-agent workaround: Send ps output to stderr (oops)

diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index c88d40be47f7fce7a5cacec963d1b63e9bbf2625..7a164eff2bd9b569b18c93040b598f26da921f81 100755 (executable)
--- a/tests/setup/gnupg
+++ b/tests/setup/gnupg
@@ -7,10 +7,11 @@ cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*
 
 export DGIT_TEST_GNUPG_GLOBAL_LOCK=$tmp/gnupg/dgit-test-global-lock
+export DGIT_TEST_GNUPG_LOG=$tmp/gnupg-workarounds.log
 
 setup='
        export GNUPGHOME=$tmp/gnupg
-       export DGIT_TEST_GNUPG_GLOBAL_LOCK
+       export DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG
 
        cat >$tmp/gnupg/gpg-agent.conf <<END
        log-file $tmp/gnupg/AGENT.log
@@ -27,6 +28,7 @@ eval "$setup"
 
 gpg --list-secret
 
-t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK' 'gnupg' "$setup"
+t-setup-done 'DGIT_TEST_GNUPG_GLOBAL_LOCK DGIT_TEST_GNUPG_LOG' \
+       'gnupg' "$setup"
 
 t-ok

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 "$@"

diff --git a/tests/tstunt/gpg-withagent b/tests/tstunt/gpg-withagent
index 4b2ee1a32890eb14dc388d0efda0008405b1876f..b7b8bfd787680f9db0ec3d95ad02022e6bf032b4 100755 (executable)
--- a/tests/tstunt/gpg-withagent
+++ b/tests/tstunt/gpg-withagent
@@ -51,7 +51,7 @@ d
 
 set +e
 $DGIT_TEST_REAL_GPG                                    \
-       --agent-program=$DGIT_STUNT_AGENT "$@"
+       --agent-program=$DGIT_STUNT_AGENT "$@" 2>&9
 rc=$?
 set -e