summaryrefslogtreecommitdiff
path: root/debian/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 09:58:05 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 10:31:16 +0100
commit404b824d7a46eee9fe76398fda6a44a7e9cf3681 (patch)
treee56236e3f0b2dd98cacecc39cd30cb9203b0e9aa /debian/tests
parent6afbad208f42c5f4b2f232988a7ed775b638ec7b (diff)
git-debrebase: test suite: New gdr-merge test
This still has a lot of xxx's, but as it is right now it passes, despite all the bugs. This seems like a reasonable baseline for more work. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian/tests')
-rw-r--r--debian/tests/control2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/tests/control b/debian/tests/control
index e3274f2..1a4f510 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -20,7 +20,7 @@ Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, git-debrebase, git-buildpackage, faketime
-Tests: gdr-newupstream gdr-viagit
+Tests: gdr-merge gdr-newupstream gdr-viagit
Tests-Directory: tests/tests
Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime