tests: Honour DGIT_TEST_INTREE

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 5e64b99cd577b58bf6ddee4e4a421773a16be3ee..cccdc35dd5a6c1d2e09816360fabc1ae605ffd6e 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -3,6 +3,12 @@
 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="${DGIT_TEST_TESTNAME-${0##*/}}"
@@ -105,10 +111,10 @@ t-archive () {
 }
 
 t-dgit () {
+       local dgit=${DGIT_TEST-dgit}
        : '
-
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-       ${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
+       $dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
                -dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
                -k39B13D8A "$@"
        : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
@@ -116,7 +122,7 @@ t-dgit () {
 }
 
 t-diff-nogit () {
-       diff --exclude=.git -ruN $*
+       diff --exclude=.git --exclude=.pc -ruN $*
 }
 
 t-cloned-fetched-good () {