X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=57b9e38e8d92b41b75a554730da6469284432b96;hb=80660b109ae671e5164c6738919f34db06719236;hp=5b6b1d51757682d49c7a0caeb36d071adc32791b;hpb=2062bb466224694014d2352879d9246aa4ad8258;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 5b6b1d51..57b9e38e 100644
--- 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 \
+		../*.{deb,changes,dsc,buildinfo} \
+		../*.{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
-	GZIP=-1 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 () {