dgit: Set up a merge driver for debian/changelog. Closes:#769291.

[dgit.git] / tests / using-intree

diff --git a/tests/using-intree b/tests/using-intree
index 70d84e180bd22bb3a7fcaf66abde9d636d1aeed8..0235c2098fa8ad4f364ed23d6ca8cb056a198af4 100755 (executable)
--- a/tests/using-intree
+++ b/tests/using-intree
@@ -1,6 +1,17 @@
 #!/bin/bash
+#
+# usage:
+#   cd .../dgit.git
+#   tests/using-intree tests/test/some-test
+# or
+#   cd .../dgit.git
+#   tests/using-intree tests/run-all
+#
+# effects:
+#   sets DGIT_TEST_INTREE which causes tests/lib to have test scripts
+#   using programs etc. from the working tree
+
 set -e
-tree=`pwd`
-export DGIT_TEST="$tree/dgit"
-export DGIT_REPOS_SERVER_TEST="$tree/dgit-repos-server"
+pwd=`pwd`
+export DGIT_TEST_INTREE="$pwd"
 exec "$@"