From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 13 Jan 2017 17:00:49 +0000 (+0000)
Subject: test suite: default dsc distro config setting: Move to lib.
X-Git-Tag: archive/debian/3.3~27
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=8e4a69d54bb811aabe6eb2b133d142771c30f997

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 3c852ed5..a01051ec 100644
--- 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 2607ca2f..7b9de175 100644
--- 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 fc3960a8..59e8d651 100755
--- 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 ----------