diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-22 17:36:08 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-22 17:36:18 +0100 |
commit | 4f3269edb8a99fca1862c59bdad1a2a4f90b3099 (patch) | |
tree | 149b17a08586b2e3613e4df7b71ee9a3afa8ee6a | |
parent | 03234a4d7d5c99e71fb0f1447acdb2241d58c7d8 (diff) |
test suite: dgit/gdr interop: test make-patches exiting 7
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/tests/control | 2 | ||||
-rwxr-xr-x | tests/tests/gdr-makepatches7 | 37 |
2 files changed, 38 insertions, 1 deletions
diff --git a/debian/tests/control b/debian/tests/control index 1da95fa..378cf4c 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-subcommands +Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-makepatches7 gdr-subcommands Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-debrebase, git-buildpackage, faketime diff --git a/tests/tests/gdr-makepatches7 b/tests/tests/gdr-makepatches7 new file mode 100755 index 0000000..9c39710 --- /dev/null +++ b/tests/tests/gdr-makepatches7 @@ -0,0 +1,37 @@ +#!/bin/bash +set -e +. tests/lib + +t-dependencies GDR + +t-setup-import gdr-convert-gbp + +cd $p + +t-some-changes for-rebase-fixup m + +t-git-debrebase +t-git-debrebase make-patches + +t-some-changes for-dgit-fixup m + +t-git-debrebase + +t-expect-fail 'dgit: failed command: test-suite-break-git-debrebase' \ +t-dgit -wgf --git-debrebase=test-suite-break-git-debrebase quilt-fixup + +t-dgit -wgf --git-debrebase=true quilt-fixup + +t-some-changes for-make-patches-fails-then-dgit-fixup m + +t-expect-fail 'Patch export produced patch amendments' \ +t-git-debrebase make-patches + +t-dgit -wgf quilt-fixup + +t-refs-same-start +t-ref-head +t-dgit -wg quilt-fixup +t-ref-head + +t-ok |