test suite: default dsc distro config setting: Move to lib.

We need this for the .dscs we have in tests/pkg-srcs/.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 3c852ed54bc25efaae105052a39f5aedcd973daa..a01051ecb951fbf22a76e3aa0852e356bbf5ae8c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ dgit (3.3~) unstable; urgency=medium
   Packaging:
   * Remove redundant Recommends on libtext-iconv-perl.
 
+  Test suite:
+  * Move default dsc distro config setting to lib.  We need this
+    for the .dscs we have in tests/pkg-srcs/.
+
  --
 
 dgit (3.2) unstable; urgency=medium

diff --git a/tests/lib b/tests/lib
index 2607ca2face2f67b9c04c6b232ca1b6413be37ee..7b9de175155708bf979ccf036453d1b0d6d3dbb3 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -1089,6 +1089,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    ;;

diff --git a/tests/tests/protocol-compat b/tests/tests/protocol-compat
index fc3960a8f9db5b467770b7908eb79e3af77f8809..59e8d6515b128ed8cfd4ab1b05e682400bfb2633 100755 (executable)
--- a/tests/tests/protocol-compat
+++ b/tests/tests/protocol-compat
@@ -64,8 +64,6 @@ prep
 
 perl -i -pe 's/^(Dgit: \w+).*/$1/' $dscf
 
-t-git-config dgit.default.old-dsc-distro test-dummy
-
 check
 
 : ---------- expect fail ----------