X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=2dffdacee0f614fa22024fa3c6e515bc253aa22d;hp=2842b92aadea744a5be09c8faeb8668d8c71f07e;hb=2ba1d04106ad92d32e7614ad9d94fce48c363076;hpb=881c765e52b6bd7e88becbf9ad8ab091023e3e35

diff --git a/tests/lib b/tests/lib
index 2842b92a..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
@@ -37,16 +39,27 @@ fail () {
 	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 () {
@@ -82,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 () {
@@ -188,16 +204,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 +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-//}" "$@"
+}