diff options
-rw-r--r-- | debian/tests/control | 4 | ||||
-rwxr-xr-x | tests/tests/gdr-fresh | 45 |
2 files changed, 49 insertions, 0 deletions
diff --git a/debian/tests/control b/debian/tests/control index a2c73df..3051e87 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,6 +16,10 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc Restrictions: x-dgit-intree-only x-dgit-git-only +Tests: gdr-fresh +Tests-Directory: tests/tests +Depends: chiark-utils-bin, devscripts, git-debrebase, git-buildpackage, faketime + Tests: gdr-merge-conflicts Tests-Directory: tests/tests Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime, quilt diff --git a/tests/tests/gdr-fresh b/tests/tests/gdr-fresh new file mode 100755 index 0000000..b1e7390 --- /dev/null +++ b/tests/tests/gdr-fresh @@ -0,0 +1,45 @@ +#!/bin/bash +set -e +autoimport= +. tests/lib +. $troot/lib-gdr + +t-dependencies NO-DGIT devscripts GDR + +t-gdr-gbp-import-core + +t-git-next-date + +# leaves us on upstream +git rm debian/rules +git commit -m 'strip upstream rules' +git tag -f v1.0 + +git branch -m master master.old +git checkout -b master + +t-git-next-date + +git checkout quilt-tip debian +git commit -m 'initial debianisation' + +git-deborig + +dgit-quilt-fixup-uses-gdr () { + t-git-next-date + + DGIT_TEST_DEBUG=-DD t-dgit quilt-fixup 2>&1 |tee ../fixup.out + grep '^branch_is_gdr .* YES$' ../fixup.out +} + +dgit-quilt-fixup-uses-gdr + +git checkout --detach patch-queue/quilt-tip +git rebase master +git push . HEAD:master +git checkout master + +dgit-quilt-fixup-uses-gdr +t-gdr-made-patches + +t-ok |