X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=fb6b2fc068273ab2989250637a80eb58846d1407;hp=1373020bab1f9b1c60c48f40763101a64b968aab;hb=4cc40918b8c3e91f7cd3f0af067d9df270bfee66;hpb=d198bbd72d591b6deba779a8d24cf9bc9ae80894

diff --git a/tests/lib b/tests/lib
index 1373020b..fb6b2fc0 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
@@ -46,7 +48,12 @@ 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
+	if test -f $gs.edit; then
+		cp -al $gs.edit $tmp/git/${p}.git
+	else
+		(set -e; cd $tmp/git; tar xf $gs.tar)
+	fi
 }
 
 t-git-none () {
@@ -82,10 +89,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 () {
@@ -96,7 +106,7 @@ t-cloned-fetched-good () {
 	t-diff-nogit ../extract/$p-${v%-*} .
 	t-clean-on-branch dgit/sid
 	t-refs-same-start
-	t-refs-same-more \
+	t-refs-same \
 		refs/heads/dgit/sid \
 		refs/remotes/dgit/dgit/sid
 	t-refs-notexist dgit/unstable remotes/dgit/dgit/unstable
@@ -147,7 +157,7 @@ t-refs-same-start () {
 	t_ref_val=''
 }
 
-t-refs-same-more () {
+t-refs-same () {
 	local g
 	for g in $*; do
 		t-ref-same $g
@@ -171,7 +181,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
@@ -179,7 +189,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 \
@@ -188,16 +198,23 @@ t-pushed-good () {
 	git verify-tag `t-v-tag`
 }
 
-t-ref-dsc-dgit () {
-	local dsc=${p}_${v}.dsc
-	local val=`perl -e '
+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/$dsc`
+		$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"
 }
 
@@ -207,3 +224,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-//}" "$@"
+}