+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)
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
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
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 "$@"
set +e
$DGIT_TEST_REAL_GPG \
- --agent-program=$DGIT_STUNT_AGENT "$@"
+ --agent-program=$DGIT_STUNT_AGENT "$@" 2>&9
rc=$?
set -e