Previously 'make' was the only option, or manually specifying the
'TEST_DIRECTORY'.
Signed-off-by: Felipe Contreras <felipe.contre...@gmail.com>
---
contrib/remote-helpers/Makefile | 1 +
contrib/remote-helpers/test-bzr.t | 3 ++-
contrib/remote-helpers/test-hg-bidi.t | 3 ++-
contrib/remote-helpers/test-hg-hg-git.t | 3 ++-
contrib/remote-helpers/test-hg.t | 3 ++-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/contrib/remote-helpers/Makefile b/contrib/remote-helpers/Makefile
index 2c91ec6..55abf0b 100644
--- a/contrib/remote-helpers/Makefile
+++ b/contrib/remote-helpers/Makefile
@@ -5,6 +5,7 @@ export T := $(addprefix $(CURDIR)/,$(TESTS))
export MAKE := $(MAKE) -e
export PATH := $(CURDIR):$(PATH)
export TEST_LINT := test-lint-executable test-lint-shell-syntax
+export TEST_DIRECTORY := $(CURDIR)/../../t
export SCRIPT_PYTHON := $(addprefix $(CURDIR)/,$(SCRIPTS))
diff --git a/contrib/remote-helpers/test-bzr.t
b/contrib/remote-helpers/test-bzr.t
index 5dfa070..0f24c48 100755
--- a/contrib/remote-helpers/test-bzr.t
+++ b/contrib/remote-helpers/test-bzr.t
@@ -5,7 +5,8 @@
test_description='Test remote-bzr'
-. ./test-lib.sh
+test -z "$TEST_DIRECTORY" && TEST_DIRECTORY="$PWD/../../t"
+. "$TEST_DIRECTORY"/test-lib.sh
if ! test_have_prereq PYTHON; then
skip_all='skipping remote-bzr tests; python not available'
diff --git a/contrib/remote-helpers/test-hg-bidi.t
b/contrib/remote-helpers/test-hg-bidi.t
index f569697..8707eb9 100755
--- a/contrib/remote-helpers/test-hg-bidi.t
+++ b/contrib/remote-helpers/test-hg-bidi.t
@@ -8,7 +8,8 @@
test_description='Test bidirectionality of remote-hg'
-. ./test-lib.sh
+test -z "$TEST_DIRECTORY" && TEST_DIRECTORY="$PWD/../../t"
+. "$TEST_DIRECTORY"/test-lib.sh
if ! test_have_prereq PYTHON; then
skip_all='skipping remote-hg tests; python not available'
diff --git a/contrib/remote-helpers/test-hg-hg-git.t
b/contrib/remote-helpers/test-hg-hg-git.t
index 7f579c8..ac1de96 100755
--- a/contrib/remote-helpers/test-hg-hg-git.t
+++ b/contrib/remote-helpers/test-hg-hg-git.t
@@ -8,7 +8,8 @@
test_description='Test remote-hg output compared to hg-git'
-. ./test-lib.sh
+test -z "$TEST_DIRECTORY" && TEST_DIRECTORY="$PWD/../../t"
+. "$TEST_DIRECTORY"/test-lib.sh
if ! test_have_prereq PYTHON; then
skip_all='skipping remote-hg tests; python not available'
diff --git a/contrib/remote-helpers/test-hg.t b/contrib/remote-helpers/test-hg.t
index 8de2aa7..a362867 100755
--- a/contrib/remote-helpers/test-hg.t
+++ b/contrib/remote-helpers/test-hg.t
@@ -8,7 +8,8 @@
test_description='Test remote-hg'
-. ./test-lib.sh
+test -z "$TEST_DIRECTORY" && TEST_DIRECTORY="$PWD/../../t"
+. "$TEST_DIRECTORY"/test-lib.sh
if ! test_have_prereq PYTHON; then
skip_all='skipping remote-hg tests; python not available'
--
1.8.3.rc3.312.g47657de
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
