test suite: defdistro-setup: Test that setup-* functions distro selection works.

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

diff --git a/debian/changelog b/debian/changelog
index 35969725c38e8ef92f59ad5655f8bddb48c20180..09f4e0cf6dcadd8d8769bea5bc71db2239d93e47 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ dgit (3.8~) unstable; urgency=medium
   Bugfixes:
   * Make dgit-setup-* work in default distro.
 
+  Test suite:
+  * defdistro-setup: Test that setup-* functions distro selection works.
+
  --
 
 dgit (3.7) unstable; urgency=medium

diff --git a/debian/tests/control b/debian/tests/control
index 871183562c92434671d710d81efa5b09774f10b8..ea79c22d67d5a58b7292b0ec375570d5f74ae278 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -29,7 +29,7 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential
 Restrictions: x-dgit-git-only
 
-Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt
+Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version protocol-compat push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential
 

diff --git a/tests/tests/defdistro-setup b/tests/tests/defdistro-setup
new file mode 100755 (executable)
index 0000000..24faa33
--- /dev/null
+++ b/tests/tests/defdistro-setup
@@ -0,0 +1,19 @@
+#!/bin/bash
+. tests/lib
+
+t-defdistro
+
+t-select-package example
+t-worktree 1.0
+
+cd example
+
+t-git-config dgit-suite.DGIT-SETUP-TREE.distro test-dummy
+
+t-dgit setup-useremail
+t-dgit setup-mergechangelogs
+t-dgit setup-gitattributes
+
+t-dgit setup-new-tree
+
+t-ok