[PATCH v2] test-lib.sh: set PERL5LIB instead of GITPERLLIB
- From
- Lea Wiemann <lewiemann@gmail.com>
- Date
- Jun 2, 2008, 14:13 UTC
- Message-ID
- <1212415996-32130-1-git-send-email-LeWiemann@gmail.com>
- In-Reply-To
- <4843FEE2.1070708@gmail.com>
From: Lea Wiemann <lewiemann@gmail.com>
By setting PERL5LIB for the tests, we enable Perl test scripts to just say "use Git;" without adding the GITPERLLIB paths to @INC beforehand.
Also, unset GITPERLLIB so that user-set paths in GETPERLLIB don't cause the wrong module to be loaded.
Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> --- Added since v1: Unset GITPERLLIB.
t/test-lib.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh index 99b63da..8ea0511 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -454,8 +454,10 @@ GIT_CONFIG_NOSYSTEM=1 GIT_CONFIG_NOGLOBAL=1 export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL -GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git -export GITPERLLIB +unset GITPERLLIB +test -n "$PERL5LIB" && PERL5LIB=":$PERL5LIB" +PERL5LIB="$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git$PERL5LIB" +export PERL5LIB test -d ../templates/blt || { error "You haven't built things yet, have you?" }
-- 1.5.5.GIT