test suite: Trigger on indirect dependencies

As discussed on debian-ci.  Bug report to request documentation for
this in the autopkgtest spec is TBD.

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

diff --git a/debian/tests/control b/debian/tests/control
index 595ee3f631902a4711929210f870ca30dd26e902..1da95faee5e7c2059b6969dffa5e5d62e2eae63a 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -28,6 +28,11 @@ Tests: gitattributes
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bsdgames, man-db, git-man
 
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bsdgames, man-db, git-man
 

+Tests: hint-testsuite-triggers
+Tests-Directory: tests/tests
+Depends: gnupg, patch, diffutils
+Restrictions: hint-testsuite-triggers
+

 Tests: defdistro-mirror mirror mirror-debnewgit mirror-private
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, rsync
 Tests: defdistro-mirror mirror mirror-debnewgit mirror-private
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, rsync

diff --git a/tests/enumerate-tests b/tests/enumerate-tests
index 5a4d23571d656db0ff9ac4612596a086adb639bb..0599b69e6ba021ebb4559c53056f0259201f86c8 100755 (executable)
--- a/tests/enumerate-tests
+++ b/tests/enumerate-tests
@@ -59,6 +59,7 @@ dependencies-gencontrol () {
        for dep in "$deps"; do
                case "$dep" in
                NO-DGIT) dependencies='chiark-utils-bin' ;;
        for dep in "$deps"; do
                case "$dep" in
                NO-DGIT) dependencies='chiark-utils-bin' ;;

+               NO-DEFAULT) dependencies='' ;;

                GDR) gencontrol-add-deps \
                        git-debrebase git-buildpackage faketime
                        ;;
                GDR) gencontrol-add-deps \
                        git-debrebase git-buildpackage faketime
                        ;;

diff --git a/tests/lib-restricts b/tests/lib-restricts
index bffe13a2b1e9beafe37de3bf7f63555cff075b45..bb695c457770d99526f339b674979b1636264dd5 100644 (file)
--- a/tests/lib-restricts
+++ b/tests/lib-restricts
@@ -20,3 +20,7 @@ t-restriction-x-dgit-unfinished () {
        echo 'unfinished test, or unfinished feature'
        return 1
 }
        echo 'unfinished test, or unfinished feature'
        return 1
 }

+
+t-restriction-hint-testsuite-triggers () {
+       :
+}

diff --git a/tests/tests/hint-testsuite-triggers b/tests/tests/hint-testsuite-triggers
new file mode 100755 (executable)
index 0000000..f35dd43
--- /dev/null
+++ b/tests/tests/hint-testsuite-triggers
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+: "exists only to trigger ci.debian.net retests for some indirect deps"
+
+t-restrict hint-testsuite-triggers
+t-dependencies NO-DEFAULT gnupg patch diffutils
+
+t-ok