When tests invoke dgit, use --dgit= so that subprocesses use our dgit rather than...

diff --git a/debian/changelog b/debian/changelog
index 8b88fb3f161470f4c5d3aeaf9cbcfbc64f7ddd91..3dd38e4c434a847ed870b49444856465317e6609 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ dgit (0.22~experimental1) experimental; urgency=low
   * In rpush, on protocol error talking to build host, check if the
     subprocess died and report differently if so.  Closes:#736528.
   * Fixed a manpage typo.
+  * When tests invoke dgit, use --dgit= so that subprocesses use our
+    dgit rather than system one.
 
   Major new feature, currently stalled awaiting server infrastructure:
   * dgit-repos-server: New program for receiving signed-tag-based

diff --git a/tests/lib b/tests/lib
index 5e64b99cd577b58bf6ddee4e4a421773a16be3ee..e17be7f124152d67030795156c1643d1c2aaf510 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -105,10 +105,10 @@ t-archive () {
 }
 
 t-dgit () {
+       local dgit=${DGIT_TEST-dgit}
        : '
-
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-       ${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
+       $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
                -dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
                -k39B13D8A "$@"
        : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}