X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftstunt%2Fgpg;h=a108267d3ce568edc4abaaa1711ac1d3a8050778;hb=3e0e30a2fab1b5770c770bbc4df3d55bef611d20;hp=d71aa63f359d601081ef215188ef69d5cc09f120;hpb=127632098e58021e467fb56fa36466785f2cbe55;p=dgit.git

diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg
index d71aa63f..a108267d 100755
--- a/tests/tstunt/gpg
+++ b/tests/tstunt/gpg
@@ -1,6 +1,32 @@
 #!/bin/sh
 set -e
-exec 							\
+
+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