X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=fa553af9d5e89af67a971ad23617ff1eedbc376e;hb=bd7275727e7b7f1bce241c2125298e9db21551aa;hp=9693c2531a5a1d40370a9ec32694a6056ce77d36;hpb=a013d40d737ef70fae7885b5e339660ca112d978;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 9693c253..fa553af9 100644
--- a/tests/lib
+++ b/tests/lib
@@ -36,6 +36,8 @@ export DGIT_TEST_DEBUG
 export GIT_COMMITTER_DATE='1530000000 +0100'
 export GIT_AUTHOR_DATE='1530000000 +0100'
 
+export LC_CTYPE=C.UTF-8
+
 root=`pwd`
 troot=$root/tests
 testname="${DGIT_TEST_TESTNAME-${0##*/}}"
@@ -62,7 +64,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
@@ -92,7 +94,9 @@ t-expect-fail () {
 	local mpat="$1"; shift
 
 	set +o pipefail
-	LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
+	LC_MESSAGES=${expect_fail_lcmessages-C} \
+	LANGUAGE=${expect_fail_lcmessages-C} \
+	"$@" 2>&1 | tee $tmp/t.output
 	local ps="${PIPESTATUS[*]}"
 	set -o pipefail
 
@@ -342,7 +346,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 +408,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 +427,7 @@ t-fscks () {
 
 t-ok () {
 	: '========================================'
+	t-check-only-bpd
 	t-fscks
 	t-save-artifacts
 	echo ok.
@@ -1032,7 +1044,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 () {