From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 Aug 2018 09:32:08 +0000 (+0100)
Subject: test suite: Fix gdr's calls to dgit when run formally in autopkgtest.
X-Git-Tag: archive/debian/6.6~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=75ca716a6e0a737795ab552a830ee277f8fda56c

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 1ca7cf01..dce10bf4 100644
--- 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 7b43d4f2..479ef414 100644
--- 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 "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }