Let tests override GIT_BUILD_DIR so git will work if tests are not at
the same directory level as standard git tests. Prior to this change,
GIT_BUILD_DIR is hardwired to be exactly one directory above where the
test lives. A test within contrib/, for example, can now use
test-lib.sh and set an appropriate value for GIT_BUILD_DIR.
Signed-off-by: David A. Greene <greened@xxxxxxxxxxxxx>
---
t/test-lib.sh | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
------------------
diff --git a/t/test-lib.sh b/t/test-lib.sh
index a65dfc7..4585138 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -55,6 +55,7 @@ unset $(perl -e '
.*_TEST
PROVE
VALGRIND
+ BUILD_DIR
));
my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
print join("\n", @vars);
@@ -901,7 +902,14 @@ then
# itself.
TEST_DIRECTORY=$(pwd)
fi
-GIT_BUILD_DIR="$TEST_DIRECTORY"/..
+
+if test -z "$GIT_BUILD_DIR"
+then
+ # We allow tests to override this, in case they want to run tests
+ # outside of t/, e.g. for running tests on the test library
+ # itself.
+ GIT_BUILD_DIR="$TEST_DIRECTORY"/..
+fi
if test -n "$valgrind"
then
--------------------
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html