From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 19 Dec 2016 16:17:00 +0000 (+0000)
Subject: Provide and use stunt lintian and debuild
X-Git-Tag: archive/debian/2.12~20
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ce13c15ee5ac88b16b99af9f0071f4ecaff004f4;ds=sidebyside

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 b58479c7..f6d9272d 100644
--- 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.
 
+  Test suite:
+  * Provide and use stunt lintian and debuild, to avoid lintian
+    complaining about our stupid test packages.
+
  --
 
 dgit (2.11) unstable; urgency=medium
diff --git a/tests/lib b/tests/lib
index b033dde2..d075bc76 100644
--- a/tests/lib
+++ b/tests/lib
@@ -759,6 +759,16 @@ t-tstunt-parsechangelog () {
 	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
diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig
index ffc145f3..29dd4570 100755
--- a/tests/tests/gbp-orig
+++ b/tests/tests/gbp-orig
@@ -3,6 +3,8 @@ set -e
 . tests/lib
 
 t-tstunt-parsechangelog
+t-tstunt-debuild
+t-tstunt-lintian
 
 t-archive-none example
 t-git-none
diff --git a/tests/tstunt/debuild b/tests/tstunt/debuild
new file mode 100755
index 00000000..2b2ca719
--- /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
index 00000000..f7c29856
--- /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