X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=749509c4fc240d301d77cb56c8d33adbb263362d;hb=HEAD;hp=8392e79a5cfe779e61f3aa6b96c4772c06773570;hpb=6e18bd400b1759ac4200d52300faaa7516766706;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 8392e79a..749509c4 100644
--- a/tests/lib
+++ b/tests/lib
@@ -24,7 +24,16 @@ END
 
 trap '
 	rc=$?
+	set +x
+	test $rc = 0 || echo "
+%%%%%%%%%%%%%%%%%%%% EXITING $rc %%%%%%%%%%%%%%%%%%%%
+
+		Most relevant logs are just before assignment rc=$rc
+		Will now do cleanup etc.
+"
+	set -x
 	set +e
+	pwd
 	[ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \
 	[ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean
 	set -e
@@ -362,7 +371,8 @@ t-archive () {
 	v=$2
 	local dscf=${p}_$2.dsc
 	rm -f $tmp/mirror/pool/main/${p}_*
-	ln -s $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
+	${t_archive_ln_s-ln -s} \
+		 $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
 	t-archive-query $suite
 	rm -rf $tmp/extract
 	mkdir $tmp/extract