exit 16
}
-trap 'test $? = 0 || t-report-failure' EXIT
+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
+' EXIT
t-filter-out-git-hyphen-dir
export GIT_AUTHOR_DATE='1530000000 +0100'
export LC_CTYPE=C.UTF-8
+unset CDPATH
root=`pwd`
troot=$root/tests
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]
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
'
}
+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
(set -e; cd $tmp; tar xf "$simport.tar")
fi
+ mkdir -p $tmp/must-clean
+
. "$simport"
}
t-refs-same-start
t-ref-same refs/heads/split.p
- case "$(t-git-get-ref refs/heads/split.b)" in
+ local split_b=$(t-git-get-ref refs/heads/split.b)
+ case "$split_b" in
"$t_ref_val") ;;
"$(git rev-parse refs/heads/split.p^0)") ;;
"$(git rev-parse refs/heads/split.p^1)") ;;
- *) fail 'bad b/p' ;;
+ *) fail "bad b/p (b=$split_b)" ;;
esac
t-pushed-good-core
}
t-gbp-example-prep-no-ff () {
- t-tstunt-parsechangelog
t-archive example 1.0-1
t-git-none
t-worktree 1.0
t-dsd
t-policy dgit-repos-policy-debian
- mkdir $tmp/git
+ mkdir -p $tmp/git
t-policy-admin create-db
}
export DGIT_DRS_SENDMAIL=$troot/tstunt/sendmail
export DGIT_DRS_DGIT=$troot/tstunt/dgit
t-chain-test-somehow
+
+ mkdir ../pretend-salsa
+ (set -e; cd ../pretend-salsa; git init --bare)
+ git remote add salsa $tmp/pretend-salsa
+ # git branch --set-upstream-to complains, so
+ git config branch.master.remote salsa
+ git config branch.master.merge refs/heads/master
}
t-tagupl-run-drs () {
+ local source=$1
cd ..
cd tagupl
DGIT_DRS_ANY_URL=1 \
- DGIT_DRS_MODE="tag2upload $tmp/$p $tagname" \
+ DGIT_DRS_MODE="tag2upload $source $tagname" \
$troot/drs-git-ext
cd $tmp/$p
t-tagupl-test () {
${DGIT_DEBPUSH_TEST-git debpush} \
- --distro=test-dummy --no-push -u Senatus "$@"
+ --distro=test-dummy -u Senatus "$@"
mkdir ../tagupl
- t-tagupl-run-drs
+ t-tagupl-run-drs $tmp/pretend-salsa
+
+ cd ../pretend-salsa
+ t-refs-same refs/heads/master
+ cd ../$p
t-dgit fetch
- t-pushed-good master
}
t-buildproductsdir-config () {