summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-13 17:00:49 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-13 17:06:53 +0000
commit8e4a69d54bb811aabe6eb2b133d142771c30f997 (patch)
tree22c171ed7a661abf46f78703ae4677d2949ade78
parente02667efe2876134f1ac478d59ae0caec23d9463 (diff)
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>
-rw-r--r--debian/changelog4
-rw-r--r--tests/lib2
-rwxr-xr-xtests/tests/protocol-compat2
3 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 3c852ed..a01051e 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 2607ca2..7b9de17 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 fc3960a..59e8d65 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 ----------