test suite: Provide navigation banner when exiting nonzero

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 8392e79a5cfe779e61f3aa6b96c4772c06773570..6c823b960a3e29e87ed75c40a74e0dcb571db87b 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -24,6 +24,14 @@ 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
        [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \
        [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean
@@ -362,7 +370,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