From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 5 Nov 2014 21:23:14 +0000 (+0000)
Subject: tests: Honour DGIT_TEST_INTREE
X-Git-Tag: debian/0.30~300
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=40811280f014d238452e24619c946ecde6ec2c5a;hp=6818e4c5450f8373142af7b739739c85ad63dc21;ds=sidebyside

tests: Honour DGIT_TEST_INTREE
---

diff --git a/debian/changelog b/debian/changelog
index a14811d2..86acb725 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 01339875..cccdc35d 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 70d84e18..f20ec9df 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 "$@"