Test suite: Check that test suite list in debian/tests/control is up to date

diff --git a/debian/rules b/debian/rules
index ad842f3113f8f857b4d441a829070b9d6c494d5c..0a5933b62a6a8333127db88728c65b604bc56b03 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,4 +38,4 @@ debian/tests/control: tests/list-tests debian/tests/control.in
        $< gencontrol >$@.new && mv -f $@.new $@
 
 debian/tests/control: tests/lib-core tests/lib-restricts
        $< gencontrol >$@.new && mv -f $@.new $@
 
 debian/tests/control: tests/lib-core tests/lib-restricts

-debian/tests/control: $(wildcard tests/tests/*[^~#])
+debian/tests/control: tests/tests $(wildcard tests/tests/*[^~#])

diff --git a/debian/tests/control b/debian/tests/control
index bf4bc3fc4182ccb4224a980d410a169787a67686..9bd27a301559d4acb2b1cc08979c9cf16a910767 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,7 +3,7 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, rsync
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
 Depends: dgit, dgit-infrastructure, devscripts, rsync
 Restrictions: x-dgit-intree-only x-dgit-git-only
 

-Tests: clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast mirror mirror-debnewgit mirror-private push-buildproductsdir push-newpackage push-nextdgit quilt rpush tag-updates trustingpolicy-replay
+Tests: clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast mirror mirror-debnewgit mirror-private push-buildproductsdir push-newpackage push-nextdgit quilt rpush tag-updates test-list-uptodate trustingpolicy-replay

 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, rsync
 
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, rsync
 

diff --git a/tests/tests/test-list-uptodate b/tests/tests/test-list-uptodate
new file mode 100755 (executable)
index 0000000..a2b4c5b
--- /dev/null
+++ b/tests/tests/test-list-uptodate
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+: "just verifies internal consistency of test suite"
+
+cd $root
+$troot/list-tests gencontrol >$tmp/control-expected
+diff debian/tests/control $tmp/control-expected