From e1835188573be155d122a12fe99bb2ca6e0d4040 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 21 Aug 2015 16:40:37 +0100 Subject: Test suite: Test quilt single-debian-patch --- debian/changelog | 1 + debian/tests/control | 2 +- .../sunxi-tools_1.2-2.~~dgittest.debian.tar.gz | Bin 0 -> 5182 bytes tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc | 22 ++++++++++++ tests/pkg-srcs/sunxi-tools_1.2.orig.tar.gz | Bin 0 -> 35076 bytes tests/tests/quilt-singlepatch | 39 +++++++++++++++++++++ 6 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.gz create mode 100644 tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc create mode 100644 tests/pkg-srcs/sunxi-tools_1.2.orig.tar.gz create mode 100755 tests/tests/quilt-singlepatch diff --git a/debian/changelog b/debian/changelog index 93ce3d4..3be04f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ dgit (1.5~~) unstable; urgency=medium * Increase sqlite_busy_timeout in debpolicy-dbretry, because zealot is very slow and we need to give the other processes time to rollback and release the lock. + * Test quilt single-debian-patch. -- diff --git a/debian/tests/control b/debian/tests/control index 61380dc..5e3dce1 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -16,7 +16,7 @@ Tests: mirror mirror-debnewgit mirror-private Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, rsync -Tests: build-modes clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast push-buildproductsdir push-newpackage push-nextdgit quilt rpush tag-updates test-list-uptodate trustingpolicy-replay +Tests: build-modes clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast push-buildproductsdir push-newpackage push-nextdgit quilt quilt-singlepatch rpush tag-updates test-list-uptodate trustingpolicy-replay Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts diff --git a/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.gz b/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.gz new file mode 100644 index 0000000..c376961 Binary files /dev/null and b/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.debian.tar.gz differ diff --git a/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc b/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc new file mode 100644 index 0000000..e0161cd --- /dev/null +++ b/tests/pkg-srcs/sunxi-tools_1.2-2.~~dgittest.dsc @@ -0,0 +1,22 @@ +Format: 3.0 (quilt) +Source: sunxi-tools +Binary: sunxi-tools +Architecture: any +Version: 1.2-2.~~dgittest +Maintainer: Ian Campbell +Homepage: http://linux-sunxi.org/Sunxi-tools +Standards-Version: 3.9.5 +Vcs-Browser: http://git.debian.org/?p=collab-maint/sunxi-tools.git +Vcs-Git: git://git.debian.org/collab-maint/sunxi-tools.git +Build-Depends: debhelper (>= 9), pkg-config, libusb-1.0-0-dev, u-boot-tools +Package-List: + sunxi-tools deb utils optional +Checksums-Sha1: + 2457216dbbf5552c413753f7211f7be3db6aff54 35076 sunxi-tools_1.2.orig.tar.gz + 6f30698cd897b350a4f92b2b5dded69adca6f82e 5182 sunxi-tools_1.2-2.~~dgittest.debian.tar.gz +Checksums-Sha256: + 03a63203ff79389e728d88ad705e546aa6362a6d08b9901392acb8639998ef95 35076 sunxi-tools_1.2.orig.tar.gz + 0a513f3254d245b59aaffbeb5c43159a6461617c1f6f3c6824646c4259cda406 5182 sunxi-tools_1.2-2.~~dgittest.debian.tar.gz +Files: + dbc55f60559f9db497559176c3c753dd 35076 sunxi-tools_1.2.orig.tar.gz + a6ec0eb0d897b0121dc978fc00db2ea6 5182 sunxi-tools_1.2-2.~~dgittest.debian.tar.gz diff --git a/tests/pkg-srcs/sunxi-tools_1.2.orig.tar.gz b/tests/pkg-srcs/sunxi-tools_1.2.orig.tar.gz new file mode 100644 index 0000000..fe397fa Binary files /dev/null and b/tests/pkg-srcs/sunxi-tools_1.2.orig.tar.gz differ diff --git a/tests/tests/quilt-singlepatch b/tests/tests/quilt-singlepatch new file mode 100755 index 0000000..6a04329 --- /dev/null +++ b/tests/tests/quilt-singlepatch @@ -0,0 +1,39 @@ +#!/bin/bash +set -e +. tests/lib + +t-archive sunxi-tools 1.2-2.~~dgittest +t-git-none + +t-dgit clone $p +cd $p +t-cloned-fetched-good + +echo EXTRA-LINE-1 >>fel.c +echo EXTRA-LINE-2 >>fel.c +echo EXTRA-LINE-3 >>.gitignore + +git add fel.c .gitignore + +t-commit 'commit our stuff' 1.2-3 + +t-dgit -wgf quilt-fixup + +t-refs-same-start +t-ref-head + +t-dgit -wgf build-source + +t-dgit push +t-pushed-good dgit/sid + +diff <