test suite: Fix gdr's calls to dgit when run formally in autopkgtest.

We should not pass `--dgit='.  That causes gdr to try to exec "".

Affects gdr-import-dgitview.

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

diff --git a/debian/changelog b/debian/changelog
index 1ca7cf01d3e3e9d44e4cfb1dd4da36677f31c9f6..dce10bf40abf3a9d76429f522ca16dcbfb257340 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (6.6~) unstable; urgency=medium
 
-  * 
+  * test suite: Fix gdr's calls to dgit when run formally in
+    autopkgtest.  (Affects gdr-import-dgitview.)
 
  --
 

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 7b43d4f2d7a42179483c16e6be9af07dc32992f1..479ef414b08238c1262201e2161cb2fd30104a47 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -7,7 +7,8 @@ t-git-debrebase () {
        local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
        : '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-       $gdr --dgit=$DGIT_TEST $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
+       $gdr "--dgit=${DGIT_TEST-dgit}" $GDR_TEST_OPTS \
+               $GDR_TEST_DEBUG $t_gdr_xopts "$@"
        : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }