test suite: t-check-only-bpd: Check $tmp/.. not ..

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 9693c2531a5a1d40370a9ec32694a6056ce77d36..a4f307f8a70c3770f09536a37225b543c1e07bbe 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -62,7 +62,7 @@ t-set-using-tmp
 test -f $tmp/.save-env || \
 env -0 >$tmp/.save-env
 
-ln -f $troot/ssh ssh
+ln -sf $troot/ssh ssh
 
 export DEBCHANGE_VENDOR=dpkg
 unset VISUAL
@@ -342,7 +342,7 @@ t-archive () {
        v=$2
        local dscf=${p}_$2.dsc
        rm -f $tmp/mirror/pool/main/${p}_*
-       ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
+       ln -s $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/pool/main/
        t-archive-query $suite
        rm -rf $tmp/extract
        mkdir $tmp/extract
@@ -404,6 +404,13 @@ t-git-fsck () {
        esac
 }
 
+t-check-only-bpd () {
+       if [ "$bpd" = .. ]; then return; fi
+       t-files-notexist \
+               $tmp/*.{deb,changes,dsc,buildinfo} \
+               $tmp/*.{tar,diff}.*
+}
+
 t-fscks () {
        (
        shopt -s nullglob
@@ -416,6 +423,7 @@ t-fscks () {
 
 t-ok () {
        : '========================================'
+       t-check-only-bpd
        t-fscks
        t-save-artifacts
        echo ok.
@@ -1032,7 +1040,7 @@ t-make-orig () {
        local v=$2
        local tag=${3-v$2}
        ust=${p}_${v}.orig.tar.gz
-       git archive -o ../$ust --prefix=${p}-${v}/ $tag
+       GZIP=-1 git archive -o $bpd/$ust --prefix=${p}-${v}/ $tag
 }
 
 t-merge-conflicted-stripping-conflict-markers () {