From 3cf8e2f1c21a16e6ee27c445177cd41bede35855 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 +++ tests/tests/sbuild-gitish | 36 ++++++++++++++++++++++++++++++++ tests/worktrees/example_1.0.tar | Bin 71680 -> 92160 bytes 3 files changed, 39 insertions(+) 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/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..7d87ddac800c63bd29be6063c29976a21374f169 100644 GIT binary patch delta 12132 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 -- 2.30.2