X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftstunt%2Fgpg;h=79d8319929719c46777e841c54c54bbd654c9591;hp=a108267d3ce568edc4abaaa1711ac1d3a8050778;hb=53cdf2a1ad851c4747711877d304c647eaf83f41;hpb=0450dc6909f1543a9515f9e686a5c01c7888073b

diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg
index a108267d..79d83199 100755
--- a/tests/tstunt/gpg
+++ b/tests/tstunt/gpg
@@ -1,32 +1,6 @@
 #!/bin/sh
 set -e
 
-for attempt in '' exec; do
-
-set +e
-$attempt						\
-$DGIT_TEST_REAL_GPG					\
-	--agent-program=$DGIT_STUNT_AGENT		\
-	"$@"
-rc=$?
-set -e
-
-if [ $rc != 2 ]; then exit $rc; fi
-
-echo >&2 "WARNING - GNUPG FAILED $rc - STUNT GNUPG $attempt $*"
-
-sh -ec '
-	if [ "x$DGIT_GNUPG_STUNT_ERRLOG" != x ]; then
-		exec >"$DGIT_GNUPG_STUNT_ERRLOG"
-	else
-		exec 2>/dev/null
-	fi
-	exec >/dev/tty
-	printf "%s\n" "$*"
-' x "GNUPG WRAPPER - TROUBLE - $HOME $GNUPGHOME - FAILED $rc $attempt $*"
-
-sleep 10
-
-done
-
-exit 127
+exec \
+with-lock-ex -w "$DGIT_TEST_GNUPG_GLOBAL_LOCK" \
+	"$DGIT_TEST_TROOT"/tstunt/gpg-withagent "$@"