From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Jul 2017 16:51:15 +0000 (+0100)
Subject: sbuild-gitish: New test case to check running sbuild from git
X-Git-Tag: archive/debian/4.1~59
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8210919d03288eafc266de16ef4efd29d1cd6882;p=dgit.git

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 <ijackson@chiark.greenend.org.uk>
---

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 6f66a915..fe108d11 100644
Binary files a/tests/worktrees/example_1.0.tar and b/tests/worktrees/example_1.0.tar differ