X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftstunt%2Fgpg;h=74152bd990670362e7e62f49cefe5068fede007b;hb=7d0d834d7b41b5f3cafffc37b9a9d94966c68e0f;hp=892b9c8cf446b255a221276463553c88fc83a0f7;hpb=26e97d328b4c4e8d7b8a30120ac2a8dd51295c91;p=dgit.git

diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg
index 892b9c8c..74152bd9 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" \
+	$tmp "$DGIT_TEST_TROOT"/tstunt/gpg-withagent "$@"