From: Ian Jackson Date: Sat, 6 Jan 2018 00:41:45 +0000 (+0000) Subject: test suite: dpkgsourceignores-docs: Correct restriction X-Git-Tag: archive/debian/4.2~43 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=5b04e9b23dcc7596db6eb9812c063f0069b76282 test suite: dpkgsourceignores-docs: Correct restriction Restrictions need to be invoked in test suites with t-restrict NAME-OF-RESTRICTION not by calling t-restrction-something. Only the former gets translated to the format used in debian/tests/control. Reported-by: Sean Whitton Signed-off-by: Ian Jackson --- diff --git a/debian/changelog b/debian/changelog index 8ec516e4..d38c9d3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ dgit (4.2~) experimental; urgency=medium * Fix grammar error in 4.1 changelog entry. [Sean Whitton] * Remove some whitespace "errors". [Sean Whitton] + Test suite: + * dpkgsourceignores-docs: Correct restriction (so autopkgtest + won't try to run it). + -- dgit (4.1) experimental; urgency=medium diff --git a/debian/tests/control b/debian/tests/control index 2590d043..b2830691 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -6,6 +6,11 @@ Tests: clone-reprepro downstream-gitless Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, reprepro +Tests: dpkgsourceignores-docs +Tests-Directory: tests/tests +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential +Restrictions: x-dgit-intree-only + Tests: defdistro-dsd-clone-drs dsd-clone-drs Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential @@ -34,7 +39,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 defdistro-setup distropatches-reject dpkgsourceignores-correct dpkgsourceignores-docs drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle 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 quilt-useremail 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 dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle 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 quilt-useremail 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/dpkgsourceignores-docs b/tests/tests/dpkgsourceignores-docs index 7638925d..a71e7f97 100755 --- a/tests/tests/dpkgsourceignores-docs +++ b/tests/tests/dpkgsourceignores-docs @@ -2,7 +2,7 @@ set -e . tests/lib -t-restriction-x-dgit-intree-only +t-restrict x-dgit-intree-only # we need the .pod source, which is not shipped cd $tmp