test suite: stunt gnupg: Much better logging of race errors

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index f4f9fc599a6ca45aa9542664f8cf1588a963c607..0996d3e57b8636213fec97a4eea8b4aab8ddbef1 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -12,6 +12,7 @@ t-report-failure () {
        rc=$1
        cat <<END >&2
 TEST FAILED
+cwd: $PWD
 funcs: ${FUNCNAME[*]}
 lines: ${BASH_LINENO[*]}
 files: ${BASH_SOURCE[*]}
@@ -388,7 +389,7 @@ t-fscks () {
        (
        shopt -s nullglob
        for d in $tmp/*/.git $tmp/git/*.git; do
-               cd "$d"
+               cd "${d%/.git}"
                t-git-fsck
        done
        )
@@ -406,7 +407,7 @@ t-rm-dput-dropping () {
 
 t-dgit () {
        local dgit=${DGIT_TEST-dgit}
-       pwd
+       pwd >&2
        : '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
        $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
@@ -783,6 +784,7 @@ t-822-field () {
 
 t-defdistro () {
        export DGIT_TEST_DISTRO=''
+       distro=''
        t-git-config dgit-suite.unstable.distro test-dummy
 }