Provide and use stunt lintian and debuild

This avoids lintian complaining about our stupid test packages.

We need the stunt debuild because debuild likes to launder the
environment, removing our stunt lintian from PATH !

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

diff --git a/debian/changelog b/debian/changelog
index b58479c727ddccbeff63f9fc8d170005d3149d0e..f6d9272df1a8b05cbb538e177572cd10213a5347 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ dgit (2.12~) unstable; urgency=medium
   * Fix dgit-repos-policy-debian which broke due to recent git setting
     GIT_ALTERNATE_OBJECT_DIRECTORIES in the pre-receive-hook.
 
   * Fix dgit-repos-policy-debian which broke due to recent git setting
     GIT_ALTERNATE_OBJECT_DIRECTORIES in the pre-receive-hook.
 

+  Test suite:
+  * Provide and use stunt lintian and debuild, to avoid lintian
+    complaining about our stupid test packages.
+

  --
 
 dgit (2.11) unstable; urgency=medium
  --
 
 dgit (2.11) unstable; urgency=medium

diff --git a/tests/lib b/tests/lib
index b033dde2f78040b5a55ea06dd781d8fb1db5a772..d075bc763f0d05249b233294d64dd91bc6b7c0f7 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -759,6 +759,16 @@ t-tstunt-parsechangelog () {
        t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 
        t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 

+t-tstunt-lintian () {
+       t-tstunt lintian
+}
+
+t-tstunt-debuild () {
+       : ${DGIT_TEST_REAL_DEBUILD:=$(type -p debuild)}
+       export DGIT_TEST_REAL_DEBUILD
+       t-tstunt debuild
+}
+

 t-incoming-dsc () {
        local dsc=${p}_${v}.dsc
        incoming_dsc=$tmp/incoming/$dsc
 t-incoming-dsc () {
        local dsc=${p}_${v}.dsc
        incoming_dsc=$tmp/incoming/$dsc

diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig
index ffc145f3df2184178330047035b902155712c164..29dd4570848b7234efdb7619e8771e2e99da0321 100755 (executable)
--- a/tests/tests/gbp-orig
+++ b/tests/tests/gbp-orig
@@ -3,6 +3,8 @@ set -e
 . tests/lib
 
 t-tstunt-parsechangelog
 . tests/lib
 
 t-tstunt-parsechangelog

+t-tstunt-debuild
+t-tstunt-lintian

 
 t-archive-none example
 t-git-none
 
 t-archive-none example
 t-git-none

diff --git a/tests/tstunt/debuild b/tests/tstunt/debuild
new file mode 100755 (executable)
index 0000000..2b2ca71
--- /dev/null
+++ b/tests/tstunt/debuild
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+echo "DGIT TEST STUNT DEBUILD $*" >&2
+"${DGIT_TEST_REAL_DEBUILD}" --preserve-env --preserve-envvar PATH "$@"

diff --git a/tests/tstunt/lintian b/tests/tstunt/lintian
new file mode 100755 (executable)
index 0000000..f7c2985
--- /dev/null
+++ b/tests/tstunt/lintian
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo >&2 'W: dgit test suite stunt lintian detects no problems'
+exit 0