summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-05 10:32:08 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-05 10:32:51 +0100
commit75ca716a6e0a737795ab552a830ee277f8fda56c (patch)
treee24020fd466e8c9f7a54738a63acd859373fa972
parent486fcc0b7b82c9dcca4a4ad52af592e176ab8f18 (diff)
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>
-rw-r--r--debian/changelog3
-rw-r--r--tests/lib-gdr3
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 1ca7cf0..dce10bf 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 7b43d4f..479ef41 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 "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
}