diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-08-04 22:27:54 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-08-04 23:06:18 +0100 |
commit | 0450dc6909f1543a9515f9e686a5c01c7888073b (patch) | |
tree | 5b6c586efbdce2194ee21edfaa98a64adfca9b79 /tests | |
parent | a6c565be751393ef52d2b74919b7ce2744019394 (diff) |
test suite: stunt gnupg: Much better logging of race errors
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/run-all | 2 | ||||
-rwxr-xr-x | tests/tstunt/gpg | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/run-all b/tests/run-all index 3877c76..cfa5ce2 100755 --- a/tests/run-all +++ b/tests/run-all @@ -15,6 +15,8 @@ fi mkdir -p tests/tmp +export DGIT_GNUPG_STUNT_ERRLOG=$( tty -s ||: ) + ( set -x exec make $jcpus -k -f tests/Makefile "$@" diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg index 790c46c..a108267 100755 --- a/tests/tstunt/gpg +++ b/tests/tstunt/gpg @@ -15,6 +15,18 @@ 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 |