X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=248dca568f5214dabc24bb70eb0732af1b3ceec5;hb=e9f102d97eb1c24b16b0c5641fcfd1fbc4c0be20;hp=57b9e38e8d92b41b75a554730da6469284432b96;hpb=65bfecf7405f3e37c25222b7f16e38edce81b5fa;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 57b9e38e..248dca56 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##*/}}"
@@ -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
 
@@ -407,8 +411,8 @@ t-git-fsck () {
 t-check-only-bpd () {
 	if [ "$bpd" = .. ]; then return; fi
 	t-files-notexist \
-		../*.{deb,changes,dsc,buildinfo} \
-		../*.{tar,diff}.*
+		$tmp/*.{deb,changes,dsc,buildinfo} \
+		$tmp/*.{tar,diff}.*
 }
 
 t-fscks () {
@@ -778,16 +782,21 @@ t-splitbrain-pushed-good-end-made-dep14 () {
 	cd $tmp/$p
 }
 
-t-splitbrain-rm-gitignore-patch () {
+t-splitbrain-rm-1-patch () {
+	local patchname=$1
 	perl -i -pe '
-		next unless $_ eq "auto-gitignore\n";
+		next unless $_ eq "'"$patchname"'\n";
 		die if $counter++;
 		chomp;
-		rename "debian/patches/$_", "../t-auto-gitignore" or die $!;
+		rename "debian/patches/$_", "../t-'"$patchname"'" or die $!;
 		$_ = "";
 	' debian/patches/series
 }
 
+t-splitbrain-rm-gitignore-patch () {
+	t-splitbrain-rm-1-patch auto-gitignore
+}
+
 t-gbp-pushed-good () {
 	local suite=${1:-sid}
 	t-splitbrain-pushed-good-start
@@ -822,12 +831,14 @@ t-gbp-pushed-good () {
 }
 
 t-unapplied-pushed-good () {
+	local suite=${1:-sid}
 	t-splitbrain-pushed-good-start
 	t-splitbrain-pushed-good--unpack --skip-patches
 	t-splitbrain-pushed-good-end-made-dep14
 }
 
 t-dpm-pushed-good () {
+	local suite=${1:-sid}
 	t-splitbrain-pushed-good-start
 	t-splitbrain-pushed-good--unpack
 	t-splitbrain-rm-gitignore-patch
@@ -1088,7 +1099,6 @@ t-drs () {
  t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S "
  t-git-config dgit-distro.test-dummy.git-check true
  t-git-config dgit-distro.test-dummy.git-create true
- t-git-config dgit-distro.test-dummy.dgit-tag-format new,old,maint
 	cp $troot/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
 	cp $troot/suites $tmp/.
 	cp $troot/suites $tmp/suites-master
@@ -1110,15 +1120,6 @@ t-drs () {
 	ln -sf /bin/true $drs_dispatch/policy-hook
 }
 
-t-newtag () {
- export tagpfx=archive/test-dummy
- t-git-config dgit-distro.test-dummy.dgit-tag-format new,maint
-}
-t-oldtag () {
- export tagpfx=test-dummy
- t-git-config dgit-distro.test-dummy.dgit-tag-format old
-}
-
 t-dsd () {
 	t-drs
  t-git-config dgit-distro.test-dummy.ssh "$troot/dsd-ssh"