chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: gpg agent workaround: Fix bugs in log neatening.
[dgit.git]
/
tests
/
tstunt
/
gpg
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=$?
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
if [ "x$DGIT_TEST_BYHAND" != x ]; then
- echo >&2 "BYHAND, not
catt
ing $DGIT_TEST_GNUPG_LOG"
+ echo >&2 "BYHAND, not
dump
ing $DGIT_TEST_GNUPG_LOG"
else
echo >&2 "########################################"
echo >&2 "$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 "end of $DGIT_TEST_GNUPG_LOG"
+ echo >&2 "########################################"
fi
exit $rc
' x \
fi
exit $rc
' x \