From 8210919d03288eafc266de16ef4efd29d1cd6882 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 17:51:15 +0100 Subject: [PATCH] sbuild-gitish: New test case to check running sbuild from git This involves creating a new "gitish-only" branch in the example worktree. Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ debian/tests/control | 2 +- tests/tests/sbuild-gitish | 36 ++++++++++++++++++++++++++++++++ tests/worktrees/example_1.0.tar | Bin 71680 -> 81920 bytes 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100755 tests/tests/sbuild-gitish diff --git a/debian/changelog b/debian/changelog index 5978c663..aec94185 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ dgit (4.1~) experimental; urgency=medium Internal changes: * using-these: New script to help with ad-hoc-testing. + Test suite: + * sbuild-gitish: New test case to check running sbuild from git + -- dgit (4.0) experimental; urgency=low diff --git a/debian/tests/control b/debian/tests/control index 0df610e7..04095cb2 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -19,7 +19,7 @@ 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 +Tests: build-modes-sbuild quilt-gbp-build-modes-sbuild sbuild-gitish Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, sbuild Restrictions: x-dgit-schroot-build diff --git a/tests/tests/sbuild-gitish b/tests/tests/sbuild-gitish new file mode 100755 index 00000000..c20bc93d --- /dev/null +++ b/tests/tests/sbuild-gitish @@ -0,0 +1,36 @@ +#!/bin/bash +set -e +. tests/lib + +t-dependencies sbuild +t-restrict x-dgit-schroot-build + +t-tstunt-parsechangelog + +t-prep-newpackage example 1.1 + +cd $p + +build () { + git clean -xdf + sbuild -c build -A --no-clean-source \ + --dpkg-source-opts='-Zgzip -z1 --format=1.0 -sn' +} + +git checkout quilt-tip-1.1~0 + +build + +git checkout gitish-only~0 + +cat <<'END' >clean-target-hook +#!/bin/sh +set -ex +test "$SCHROOT_SESSION_ID" +END +git add clean-target-hook +git commit -m 'insist on schroot' + +build + +t-ok diff --git a/tests/worktrees/example_1.0.tar b/tests/worktrees/example_1.0.tar index 6f66a915eb6082dfb3d20b85727710cadc51ab3e..fe108d11aafef68cbd24ac543a6644adfececcae 100644 GIT binary patch delta 10407 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 UnnBg)&&DP2%T_|)PcH2KACZJlZ2$lO delta 3550 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 Xh|;W$L}^a<{nhk|QH0#kdxt*&ZPfZ| -- 2.30.2