summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-25 12:32:54 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-25 12:55:17 +0100
commit1f8626d4eaf79e8f26f0e27ff076fd5469a7cbe4 (patch)
tree59b6d83e50fd431b289cb65c8b91ad7998d18cea
parent7b33413197c2f4fc5c9718f6c4fd4724c5838888 (diff)
test suite: Test dgit branch_is_gdr walker on a merge resolution
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--debian/tests/control4
-rwxr-xr-xtests/tests/gdr-merge5
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/tests/control b/debian/tests/control
index f8957a0..a2c73df 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -20,11 +20,11 @@ Tests: gdr-merge-conflicts
Tests-Directory: tests/tests
Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime, quilt
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
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-merge gdr-newupstream gdr-viagit
+Tests: gdr-newupstream gdr-viagit
Tests-Directory: tests/tests
Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime
diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index d2df2b8..78b79e9 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -3,7 +3,7 @@ set -e
autoimport=
. tests/lib
-t-dependencies NO-DGIT GDR
+t-dependencies GDR
t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp-noarchive
@@ -59,4 +59,7 @@ t-some-changes after
t-git-debrebase
t-gdr-good laundered
+t-dgit quilt-fixup
+t-gdr-made-patches
+
t-ok