tests: Honour DGIT_TEST_INTREE

diff --git a/debian/changelog b/debian/changelog
index a14811d26c8dd8a1a4f1493b9623000e7ebef2be..86acb725d16508f8609127aee92cdcc8fed00b9f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ dgit (0.23~) unstable; urgency=low
   * dgit-repos-server: Handle ' ' in SSH_ORIGINAL_COMMAND (which some
     git versions send, sigh).
 
   * dgit-repos-server: Handle ' ' in SSH_ORIGINAL_COMMAND (which some
     git versions send, sigh).
 

+  * Test suite restructuring to support new tests.
+

  --
 
 dgit (0.22.1) unstable; urgency=high
  --
 
 dgit (0.22.1) unstable; urgency=high

diff --git a/tests/lib b/tests/lib
index 013398750c6a97a98e5915fa91171e663c6efbd6..cccdc35dd5a6c1d2e09816360fabc1ae605ffd6e 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -3,6 +3,12 @@
 exec 2>&1
 set -x
 
 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##*/}}"
 root=`pwd`
 troot=$root/tests
 testname="${DGIT_TEST_TESTNAME-${0##*/}}"

diff --git a/tests/using-intree b/tests/using-intree
index 70d84e180bd22bb3a7fcaf66abde9d636d1aeed8..f20ec9df5b0c5051156df8a9705fe8edb62f8a59 100755 (executable)
--- a/tests/using-intree
+++ b/tests/using-intree
@@ -1,6 +1,4 @@
 #!/bin/bash
 set -e
 #!/bin/bash
 set -e

-tree=`pwd`
-export DGIT_TEST="$tree/dgit"
-export DGIT_REPOS_SERVER_TEST="$tree/dgit-repos-server"
+export DGIT_TEST_INTREE=`pwd`

 exec "$@"
 exec "$@"