X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=78ec9a712153d56b8a349532d6e18fc106cd48e5;hb=69323e5f402c84897eaeea7a28cdae1b3da10066;hp=39f13825fc32bdc6bfb2d29ed0c66b2baf2f3f20;hpb=5986d81a14f60f14ee2d31967be1bc2f6ba6cc7a;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 39f13825..78ec9a71 100644
--- a/tests/lib
+++ b/tests/lib
@@ -40,6 +40,7 @@ export GIT_COMMITTER_DATE='1530000000 +0100'
 export GIT_AUTHOR_DATE='1530000000 +0100'
 
 export LC_CTYPE=C.UTF-8
+unset CDPATH
 
 root=`pwd`
 troot=$root/tests
@@ -776,11 +777,12 @@ t-splitbrain-pushed-good-start () {
 
 	t-refs-same-start
 	t-ref-same refs/heads/split.p
-	case "$(t-git-get-ref refs/heads/split.b)" in
+	local split_b=$(t-git-get-ref refs/heads/split.b)
+	case "$split_b" in
 	"$t_ref_val") ;;
 	"$(git rev-parse refs/heads/split.p^0)") ;;
 	"$(git rev-parse refs/heads/split.p^1)") ;;
-	*) fail 'bad b/p' ;;
+	*) fail "bad b/p (b=$split_b)" ;;
 	esac
 	t-pushed-good-core
 
@@ -1026,7 +1028,6 @@ t-git-pseudo-merge () {
 }
 
 t-gbp-example-prep-no-ff () {
-	t-tstunt-parsechangelog
 	t-archive example 1.0-1
 	t-git-none
 	t-worktree 1.0
@@ -1186,7 +1187,7 @@ t-debpolicy () {
 	t-dsd
 	t-policy dgit-repos-policy-debian
 
-	mkdir $tmp/git
+	mkdir -p $tmp/git
 	t-policy-admin create-db
 }
 
@@ -1212,11 +1213,12 @@ t-tagupl-settings () {
 }
 
 t-tagupl-run-drs () {
+	local source=$1
 	cd ..
 	cd tagupl
 
 	DGIT_DRS_ANY_URL=1 \
-	DGIT_DRS_MODE="tag2upload $tmp/$p $tagname" \
+	DGIT_DRS_MODE="tag2upload $source $tagname" \
 	 $troot/drs-git-ext 
 
 	cd $tmp/$p
@@ -1227,10 +1229,13 @@ t-tagupl-test () {
 		--distro=test-dummy -u Senatus "$@"
 
 	mkdir ../tagupl
-	t-tagupl-run-drs
+	t-tagupl-run-drs $tmp/pretend-salsa
+
+	cd ../pretend-salsa
+	t-refs-same refs/heads/master
+	cd ../$p
 
 	t-dgit fetch
-	t-pushed-good master
 }
 
 t-buildproductsdir-config () {