From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 8 Aug 2019 10:38:58 +0000 (+0100)
Subject: test suite: Honour new DGIT_TEST_KEEP_MUSTCLEAN
X-Git-Tag: archive/debian/9.7~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8c4f1a70c97b0683003ea91cc41d1891f7484201;p=dgit.git

test suite: Honour new DGIT_TEST_KEEP_MUSTCLEAN

FTR, using this typically results in runes like

  DGIT_TEST_KEEP_MUSTCLEAN=y tests/using-intree tests/tests/ftpmasterapi-http 2>&1 | tee tests/tmp/log

hanging instead of exiting, because the http server is still running
and its stderr is still going to tee.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib b/tests/lib
index 6f361300..c788744b 100644
--- a/tests/lib
+++ b/tests/lib
@@ -25,6 +25,7 @@ END
 trap '
 	rc=$?
 	set +e
+	[ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \
 	[ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean
 	set -e
 	test $rc = 0 || t-report-failure