1 files changed, 14 insertions, 1 deletions
diff --git a/tests/lib b/tests/lib
index 78ec9a7..6f36130 100644
--- a/tests/lib
+++ b/tests/lib
@@ -22,7 +22,13 @@ END
 	exit 16
 }
 
-trap 'test $? = 0 || t-report-failure' EXIT
+trap '
+	rc=$?
+	set +e
+	[ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean
+	set -e
+	test $rc = 0 || t-report-failure
+' EXIT
 
 t-filter-out-git-hyphen-dir
 
@@ -74,6 +80,11 @@ export DEBCHANGE_VENDOR=dpkg
 unset VISUAL
 unset GIT_EDITOR
 
+mkdir -p $tmp/must-clean
+# must-clean is usually removed after each test, on success or failure.
+# But this must not be relied on for correctness, only for garbage
+# collection etc.
+
 mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
 [test-dummy]
@@ -573,6 +584,8 @@ t-setup-import () {
 		(set -e; cd $tmp; tar xf "$simport.tar")
 	fi
 
+	mkdir -p $tmp/must-clean
+
 	. "$simport"
 }