X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=2dffdacee0f614fa22024fa3c6e515bc253aa22d;hp=b6bf81088114a2c8f792995b23e7b7544e3af4d3;hb=2ba1d04106ad92d32e7614ad9d94fce48c363076;hpb=08c5073f750f45f976c534f55804ed61adee4743

diff --git a/tests/lib b/tests/lib
index b6bf8108..2dffdace 100644
--- a/tests/lib
+++ b/tests/lib
@@ -5,7 +5,7 @@ set -x
 
 root=`pwd`
 troot=$root/tests
-testname="${0##*/}"
+testname="${DGIT_TEST_TESTNAME-${0##*/}}"
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -15,16 +15,18 @@ if [ x"$tmp" = x ]; then
 	mkdir $tmp
 fi
 cd $tmp
+export HOME=$tmp
+
 tmp=`pwd`
 export DGIT_TEST_DUMMY_DIR=$tmp
-ln $troot/ssh ssh
+ln -f $troot/ssh ssh
 
-mkdir $tmp/gnupg
+mkdir -p $tmp/gnupg
 cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*
 export GNUPGHOME=$tmp/gnupg
 
-mkdir $tmp/incoming
+mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
 [test-dummy]
 method			= local
@@ -32,16 +34,32 @@ incoming		= $tmp/incoming
 run_dinstall		= 0
 END
 
+fail () {
+	echo >&2 "failed: $*"
+	exit 1
+}
+
+t-untar () {
+	local tarfile=$1.tar
+	local edittree=$1.edit
+	if test -d "$edittree"; then
+		cp -al "$edittree"/* .
+	else
+		tar xf "$tarfile"
+	fi
+}
+
 t-worktree () {
 	rm -rf $p
-	tar xf $troot/worktrees/${p}_$1.tar
+	t-untar $troot/worktrees/${p}_$1
 }
 
 t-git () {
 	p=$1
 	v=$2
 	mkdir -p $tmp/git
-	(set -e; cd $tmp/git; tar xf $troot/git-srcs/${p}_$v.git.tar)
+	local gs=$troot/git-srcs/${p}_$v.git
+	(set -e; cd $tmp/git; t-untar $gs)
 }
 
 t-git-none () {
@@ -54,8 +72,7 @@ t-has-ancestor () {
 	local ancestor=`git rev-parse $1^{}`
 	local mbase=`git merge-base $ancestor $now`
 	if [ x$mbase != x$ancestor ]; then
-		echo "not ff $ancestor..$now, $mbase != $ancestor"
-		exit 1
+		fail "not ff $ancestor..$now, $mbase != $ancestor"
 	fi
 }	
 
@@ -78,10 +95,13 @@ t-archive () {
 }
 
 t-dgit () {
-	: '{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
+	: '
+
+{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy -D -k39B13D8A "$@"
-	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
+		-dtest-dummy $DGIT_TEST_OPTS -D -k39B13D8A "$@"
+	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+'
 }
 
 t-diff-nogit () {
@@ -91,6 +111,7 @@ t-diff-nogit () {
 t-cloned-fetched-good () {
 	t-diff-nogit ../extract/$p-${v%-*} .
 	t-clean-on-branch dgit/sid
+	t-refs-same-start
 	t-refs-same \
 		refs/heads/dgit/sid \
 		refs/remotes/dgit/dgit/sid
@@ -116,24 +137,46 @@ t-git-get-ref () {
 	'
 }
 
-t-refs-same () {
-	local f=$1
-	t-git-get-ref $f >$tmp/t.ref1
-	t-refs-same-more "$@"
+t-ref-same () {
+	local name="$1"
+	local val=`t-git-get-ref $name`
+	t-ref-same-val "$name" $val
+}
+
+t-ref-head () {
+	local val=`git rev-parse HEAD`
+	t-ref-same-val HEAD $val
+}
+
+t-ref-same-val () {
+	local name="$1"
+	local val=$2
+	case "$t_ref_val" in
+	'')		;;
+	"$val")		;;
+	*)		fail "ref varies: $name: $val != $t_ref_val" ;;
+	esac
+	t_ref_val="$val"
+}
+
+t-refs-same-start () {
+	t_ref_val=''
 }
 
-t-refs-same-more () {
+t-refs-same () {
 	local g
 	for g in $*; do
-		t-git-get-ref $g >$tmp/t.refn
-		diff $tmp/t.ref1 $tmp/t.refn
+		t-ref-same $g
 	done
 }
 
 t-refs-notexist () {
+	local val
 	for g in $*; do
-		t-git-get-ref $g >$tmp/t.refx
-		diff /dev/null $tmp/t.refx
+		val=`t-git-get-ref $g >$tmp/t.refx`
+		if [ "x$val" != x ]; then
+			fail "ref $g unexpectedly exists ($val)"
+		fi
 	done
 }
 
@@ -144,7 +187,7 @@ t-v-tag () {
 t-pushed-good () {
 	local branch=$1
 	t-ref-dsc-dgit
-	t-refs-same-more \
+	t-refs-same \
 		refs/heads/$branch \
 		`t-v-tag` \
 		refs/remotes/dgit/dgit/sid
@@ -152,7 +195,7 @@ t-pushed-good () {
 		refs/heads/dgit/unstable \
 		refs/remotes/dgit/dgit/unstable
 	(set -e; cd $tmp/git/$p.git
-	 t-refs-same-more \
+	 t-refs-same \
 		refs/dgit/sid \
 		`t-v-tag`
 	 t-refs-notexist \
@@ -161,15 +204,24 @@ t-pushed-good () {
 	git verify-tag `t-v-tag`
 }
 
-t-ref-dsc-dgit () {
+t-822-field () {
+	local file=$1
+	local field=$2
 	perl -e '
 		use Dpkg::Control::Hash;
 		my $h = new Dpkg::Control::Hash allow_pgp=>1;
-		$h->parse(\*STDIN,"dsc");
-		my $ref = $h->{"Dgit"},"\n";
-		die unless $ref =~ m/^\w+\b/;
-		print $ref,"\n";
-	' <$tmp/incoming/${p}_${v}.dsc >$tmp/t.ref1
+		$h->parse(\*STDIN,"'"$file"'");
+		my $val = $h->{"'$field'"},"\n";
+		die "'"$file $field"'" unless defined $val;
+		print $val,"\n";
+	' <$file
+}
+
+t-ref-dsc-dgit () {
+	local dsc=${p}_${v}.dsc
+	local val=`t-822-field $tmp/incoming/$dsc Dgit`
+	perl -e '$_=shift @ARGV; die "$dsc Dgit $_ ?" unless m/^\w+\b/;' "$val"
+	t-ref-same-val $dsc "$val"
 }
 
 t-apply-diff () {
@@ -178,3 +230,25 @@ t-apply-diff () {
 	(cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
 		| patch -p1 -u
 }
+
+t-git-config () {
+	git config --global "$@"
+}
+
+t-drs () {
+	export DGIT_TEST_TROOT=$troot
+	export DGIT_TEST_TMP=$tmp
+ 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-drs-test () {
+	t-drs
+	cd $root
+	export DGIT_TEST_TESTNAME="$testname"
+	export ADTTMP=$tmp
+	cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+	cp $root/tests/suites $tmp/.
+	exec "${0///drs-//}" "$@"
+}