dgit: build_source mostly uses a playtree, not $maindir

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 40f1f0992e50080022aba595a39ea42dfab13ae1..a297227fc73c6c6376927eb6db5f09b13e34b29a 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -64,6 +64,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 +74,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,10 +423,8 @@ t-save-artifacts () {
        artifacts="$AUTOPKGTEST_ARTIFACTS"
        if [ x"$artifacts" = x ]; then return; fi
        if [ x"tmp" = x ]; then return; fi
-       : '(((((((((( t-save-artifacts ))))))))))'
        GZIP=-1v tar -C "$tmp" -zc -f "$artifacts/${0##*/}.tar.gz" \
                --exclude=\*.tar .
-       : ')))))))))) t-save-artifacts ))))))))))'
 }
 
 t-rm-dput-dropping () {