From 87c063da387d8b7dbd5790eb8fd742dd1730cbe8 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 30 Dec 2017 11:02:01 +0000 Subject: quilt-gbp test: Set DGIT_TEST_TOLERATE_UNPATCHED_CLEAN In quilt-gbp we want to test whether dgit detects that quilt fixups cannot be linear because the user has failed to pass an appropriate quilt option in a patches-unapplied tree. build_source() cleans before applying patches, and the package's clean target might error out because patches are not applied. This prevents dgit from attempting quilt linearisation and thus determining that the tree might be patches-unapplied. So set an environment variable telling the package's clean target not to do that. Signed-off-by: Sean Whitton Acked-by: Ian Jackson --- tests/tests/quilt-gbp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tests/tests/quilt-gbp') diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index 3ef89e8..cf148f6 100755 --- a/tests/tests/quilt-gbp +++ b/tests/tests/quilt-gbp @@ -2,6 +2,22 @@ set -e . tests/lib +# `dgit build-source` cleans before applying patches. However, the +# clean targets of 3.0 (quilt) packages are allowed to assume that +# patches are applied. If they are not, the clean targets can +# misbehave in basically two ways: +# +# - fail to clean everything +# - error out and stop the build +# +# In this test, what we want to see is whether dgit detects that quilt +# fixup cannot be linear because the user has failed to pass --gbp. +# So we need to ensure the package's clean target does not error out, +# because that blocks dgit attempting quilt linearisation. This +# environment variable tells the example package's clean target not to +# error out if it notices that patches have not yet been applied. +export DGIT_TEST_TOLERATE_UNPATCHED_CLEAN=true + t-tstunt-parsechangelog t-gbp-example-prep -- cgit v1.2.3