test suite: Provide navigation banner when exiting nonzero

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 6f36130007d3aa2450f754b89202e6f41b4c1bc6..6c823b960a3e29e87ed75c40a74e0dcb571db87b 100644 (file)
--- 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
+       [ "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
@@ -361,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
@@ -475,6 +485,19 @@ t-dgit () {
 '
 }
 
+t-non-dgit-upload () {
+       t-dgit -wgf build-source
+
+       cd ..
+       c=${p}_${v}_source.changes
+       debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+       dput -c $tmp/dput.cf test-dummy $c
+
+       t-archive-process-incoming sid
+       t-git-next-date
+       cd $p
+}
+
 t-dgit-manpage () {
        local section=$1
        local page=$2