diff options
| -rw-r--r-- | debian/tests/control | 7 | ||||
| -rwxr-xr-x | tests/tests/sbuild-gitish | 22 |
2 files changed, 24 insertions, 5 deletions
diff --git a/debian/tests/control b/debian/tests/control index 04095cb..7b7d11c 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -19,11 +19,16 @@ Tests: defdistro-mirror mirror mirror-debnewgit mirror-private Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, rsync -Tests: build-modes-sbuild quilt-gbp-build-modes-sbuild sbuild-gitish +Tests: build-modes-sbuild quilt-gbp-build-modes-sbuild Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, sbuild Restrictions: x-dgit-schroot-build +Tests: sbuild-gitish +Tests-Directory: tests/tests +Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, sbuild, man-db +Restrictions: x-dgit-schroot-build + Tests: spelling Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential diff --git a/tests/tests/sbuild-gitish b/tests/tests/sbuild-gitish index c20bc93..c0ca927 100755 --- a/tests/tests/sbuild-gitish +++ b/tests/tests/sbuild-gitish @@ -2,19 +2,33 @@ set -e . tests/lib -t-dependencies sbuild +t-dependencies sbuild man-db t-restrict x-dgit-schroot-build t-tstunt-parsechangelog t-prep-newpackage example 1.1 +buildrune=$( + (export LC_ALL=C.UTF-8 + if [ "$DGIT_TEST_INTREE" ]; then + make -C $DGIT_TEST_INTREE dgit-user.7.view + else + man 7 dgit-user + fi) | \ + perl -ne ' + next unless m/^ +Using sbuild$/ .. 0; + next unless m/^ +\%/ .. 0; + next if !m/\S/ .. 0; + s/^ +\%//; + print or die $!; + ' +) + cd $p build () { - git clean -xdf - sbuild -c build -A --no-clean-source \ - --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn' + eval "$buildrune" } git checkout quilt-tip-1.1~0 |