test suite: add t-push-included

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 87dd37617e7f6769a8eb42657e745ecf7af9b177..68bf9d7353726fe18a393dbbd7b10cee8b81d8b7 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -40,6 +40,7 @@ root=`pwd`
 troot=$root/tests
 testname="${DGIT_TEST_TESTNAME-${0##*/}}"
 export DGIT_TEST_TROOT=$troot
+bpd=..
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -64,6 +65,7 @@ env -0 >$tmp/.save-env
 ln -f $troot/ssh ssh
 
 export DEBCHANGE_VENDOR=dpkg
+unset VISUAL
 
 mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
@@ -73,6 +75,9 @@ incoming              = $tmp/incoming
 run_dinstall           = 0
 END
 
+schroot=${DGIT_SCHROOT_CHROOT:-build}
+# Pretty much any Debian sid snapshot schroot will do.
+
 : ${t_archive_method:=aq}
 : ${tagpfx:=archive/test-dummy}
 : ${suitespecs:=sid:unstable}
@@ -419,21 +424,8 @@ t-save-artifacts () {
        artifacts="$AUTOPKGTEST_ARTIFACTS"
        if [ x"$artifacts" = x ]; then return; fi
        if [ x"tmp" = x ]; then return; fi
-       : '(((((((((( t-save-artifacts ))))))))))'
-       cp -a "$tmp"/. "$artifacts"/.
-       cd "$artifacts"/.
-       find . \( -name \*.tar -o -name \*.sample \) -print0 | \
-               xargs -0r rm -v
-       find . \( -name .git \
-               -o -path ./salsa/\* \
-               -o -path ./git/\*.git \
-               \) -type d \
-               \! -path '*/.git/*/.git' -exec sh -xec '
-                       cd "$1"
-                       "$2"/playtree-save-refs
-                       git gc --prune=all
-               ' x '{}' "$troot" \;
-       : ')))))))))) t-save-artifacts ))))))))))'
+       GZIP=-1v tar -C "$tmp" -zc -f "$artifacts/${0##*/}.tar.gz" \
+               --exclude=\*.tar .
 }
 
 t-rm-dput-dropping () {
@@ -683,6 +675,12 @@ t-push-was-source-only () {
         done
 }
 
+t-push-included () {
+    for f in $@; do
+        stat $tmp/incoming/$f
+    done
+}
+
 t-pushed-good () {
        local branch=$1
        local suite=${2:-sid}
@@ -1142,6 +1140,16 @@ t-policy-periodic () {
        : '))))))))))))))))))))))))))))))))))))))))'
 }
 
+t-buildproductsdir-config () {
+       bpd=$tmp/bpd
+       t-git-config dgit.default.build-products-dir $bpd
+       mkdir -p $bpd
+       cat <<END >>$tmp/.gbp.conf
+[buildpackage]
+export-dir = $bpd
+END
+}
+
 t-restrict () {
        local restriction=$1
        (cd $root; t-restriction-$restriction >&2)