From 4f3269edb8a99fca1862c59bdad1a2a4f90b3099 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 22 Jun 2018 17:36:08 +0100 Subject: [PATCH] test suite: dgit/gdr interop: test make-patches exiting 7 Signed-off-by: Ian Jackson --- debian/tests/control | 2 +- tests/tests/gdr-makepatches7 | 37 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100755 tests/tests/gdr-makepatches7 diff --git a/debian/tests/control b/debian/tests/control index 1da95fae..378cf4cc 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 00000000..9c397100 --- /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 -- 2.30.2