aboutsummaryrefslogtreecommitdiff
path: root/t/test-lib.sh
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2006-07-03 23:16:32 +0200
committerJunio C Hamano <junkio@cox.net>2006-07-03 18:34:53 -0700
commit6fcca938b05c33bcd8b502d6b6f178e377609fa3 (patch)
tree22287b26b74603cc780beca14a687be60f7f0f5c /t/test-lib.sh
parent3c767a08243244b18d48315f8433ba07e435f654 (diff)
downloadgit-6fcca938b05c33bcd8b502d6b6f178e377609fa3.tar.gz
git-6fcca938b05c33bcd8b502d6b6f178e377609fa3.tar.xz
Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging
This makes the Git perl scripts check $GITPERLLIB instead of $RUNNING_GIT_TESTS, which makes more sense if you are setting up your shell environment to use a non-installed Git instance. It also weeds out the @INC munging from the individual scripts and makes Makefile add it during the .perl files processing, so that we can change just a single place when we modify this shared logic. It looks ugly in the scripts, too. ;-) And instead of doing arcane things with the @INC array, we just do 'use lib' instead, which is essentialy the same thing anyway. I first want to do three separate patches but it turned out that it's quite a lot neater when bundled together, so I hope it's ok. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/test-lib.sh')
-rwxr-xr-xt/test-lib.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 298c6caa7..ad9796ee9 100755
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -206,9 +206,8 @@ PYTHON=`sed -e '1{
PYTHONPATH=$(pwd)/../compat
export PYTHONPATH
}
-RUNNING_GIT_TESTS=YesWeAre
-PERL5LIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git
-export PERL5LIB RUNNING_GIT_TESTS
+GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git
+export GITPERLLIB
test -d ../templates/blt || {
error "You haven't built things yet, have you?"
}