X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-gbp;h=e502f6b2b21897efe4532233a6947a9f1402e0e0;hb=e772b73b5b4d40e91a525c0a03dc89c7a14eb05f;hp=38d2489b21bf43d242e06e1119303d3f73e93e25;hpb=cb809d942c58dea5dfba6ad8b7e3298338ebb24e;p=dgit.git

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index 38d2489b..e502f6b2 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
@@ -9,11 +25,6 @@ t-gbp-example-prep
 t-expect-fail 'quilt fixup cannot be linear' \
   t-dgit build-source
 
-t-git-config dgit-distro.test-dummy.dgit-tag-format new
-t-expect-fail 'requires split view so server needs to support' \
-t-dgit -wgf --quilt=gbp build-source
-t-newtag
-
 t-dgit --quilt=gbp --dgit-view-save=split.b1 build-source
 git rev-parse split.b1
 
@@ -58,4 +69,4 @@ t-dgit --quilt=gbp --clean=git --dgit-view-save=split.b build-source
 
 test-push-2
 
-echo ok.
+t-ok