Merge branch 'stable' into HEAD

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 2607ca2face2f67b9c04c6b232ca1b6413be37ee..3c04155a2ddbe398ba480030186b1ab8add23186 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[*]}
@@ -411,7 +412,7 @@ t-dgit () {
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
        $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
  ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
-               ${distro--dtest-dummy} ${distro+${distro:+-d}${distro}} \
+               ${distro+${distro:+-d}}${distro--dtest-dummy} \
                $DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
                -k39B13D8A $t_dgit_xopts "$@"
        : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
@@ -783,6 +784,7 @@ t-822-field () {
 
 t-defdistro () {
        export DGIT_TEST_DISTRO=''
+       distro=''
        t-git-config dgit-suite.unstable.distro test-dummy
 }
 
@@ -1089,6 +1091,8 @@ t-alt-test () {
        t-chain-test "${t#*-}"
 }
 
+t-git-config dgit.default.old-dsc-distro test-dummy
+
 case "$0" in
 */gnupg) ;;
 *)     t-setup-import gnupg    ;;