tests: Honour DGIT_TEST_INTREE

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 1373020bab1f9b1c60c48f40763101a64b968aab..cccdc35dd5a6c1d2e09816360fabc1ae605ffd6e 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -3,9 +3,15 @@
 exec 2>&1
 set -x
 
+if [ "x$DGIT_TEST_INTREE" != x ]; then
+       : ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
+       : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/dgit-repos-server}
+       export DGIT_TEST DGIT_REPOS_SERVER_TEST
+fi
+
 root=`pwd`
 troot=$root/tests
-testname="${0##*/}"
+testname="${DGIT_TEST_TESTNAME-${0##*/}}"
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -15,16 +21,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 +45,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 () {
@@ -69,34 +88,48 @@ t-archive-none () {
        echo sid >$tmp/aq/suite.unstable
 }
 
+t-archive-process-incoming () {
+       mv incoming/${p}_${v}[._]* mirror/
+       t-archive-query
+}
+
+t-archive-query () {
+       local dscf=${p}_${v}.dsc
+       echo "${v} $dscf" >>$tmp/aq/package.sid.${p}
+}
+
 t-archive () {
        t-archive-none $1
        v=$2
        local dscf=${p}_$2.dsc
        rm -f $tmp/mirror/${p}_*
        ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/
-       echo "$2 $dscf" >>$tmp/aq/package.sid.${p}
+       t-archive-query
        rm -rf $tmp/extract
        mkdir $tmp/extract
        (set -e; cd $tmp/extract; dpkg-source -x ../mirror/$dscf)
 }
 
 t-dgit () {
-       : '{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-       ${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
-               -dtest-dummy -D -k39B13D8A "$@"
-       : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
+       local dgit=${DGIT_TEST-dgit}
+       : '
+{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
+       $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
+               -dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
+               -k39B13D8A "$@"
+       : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+'
 }
 
 t-diff-nogit () {
-       diff --exclude=.git -ruN $*
+       diff --exclude=.git --exclude=.pc -ruN $*
 }
 
 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 +180,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 +204,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 +212,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 +221,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 +247,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
+       cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+       cp $root/tests/suites $tmp/.
+}
+
+t-drs-test () {
+       t-drs
+       cd $root
+       export DGIT_TEST_TESTNAME="$testname"
+       export ADTTMP=$tmp
+       exec "${0///drs-//}" "$@"
+}