summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--tests/lib6
-rwxr-xr-xtests/using-intree4
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index a14811d..86acb72 100644
--- 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).
+ * Test suite restructuring to support new tests.
+
--
dgit (0.22.1) unstable; urgency=high
diff --git a/tests/lib b/tests/lib
index 0133987..cccdc35 100644
--- 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##*/}}"
diff --git a/tests/using-intree b/tests/using-intree
index 70d84e1..f20ec9d 100755
--- a/tests/using-intree
+++ b/tests/using-intree
@@ -1,6 +1,4 @@
#!/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 "$@"