summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Marsano <luis.marsano@gmail.com>2018-06-13 05:10:38 +0200
committerJunio C Hamano <gitster@pobox.com>2018-06-18 17:44:33 +0200
commit04f673d7e47ba8aa413a47038abfc76b16d6c23b (patch)
treec5c12d62e27a10da7b2befd4a6297e26e00e770f
parentgit-credential-netrc: minor whitespace cleanup in test script (diff)
downloadgit-04f673d7e47ba8aa413a47038abfc76b16d6c23b.tar.xz
git-04f673d7e47ba8aa413a47038abfc76b16d6c23b.zip
git-credential-netrc: use in-tree Git.pm for tests
The netrc test.pl script calls git-credential-netrc which imports the Git module. Pass GITPERLLIB to git-credential-netrc via PERL5LIB to ensure the in-tree Git module is used for testing. Signed-off-by: Luis Marsano <luis.marsano@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
-rwxr-xr-xcontrib/credential/netrc/t-git-credential-netrc.sh3
-rwxr-xr-xcontrib/credential/netrc/test.pl1
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/credential/netrc/t-git-credential-netrc.sh b/contrib/credential/netrc/t-git-credential-netrc.sh
index c5661087fe..07227d0228 100755
--- a/contrib/credential/netrc/t-git-credential-netrc.sh
+++ b/contrib/credential/netrc/t-git-credential-netrc.sh
@@ -23,9 +23,10 @@
# The external test will outputs its own plan
test_external_has_tap=1
+ export PERL5LIB="$GITPERLLIB"
test_external \
'git-credential-netrc' \
- perl "$TEST_DIRECTORY"/../contrib/credential/netrc/test.pl
+ perl "$GIT_BUILD_DIR"/contrib/credential/netrc/test.pl
test_done
)
diff --git a/contrib/credential/netrc/test.pl b/contrib/credential/netrc/test.pl
index 1e1001030e..2b5280ad6a 100755
--- a/contrib/credential/netrc/test.pl
+++ b/contrib/credential/netrc/test.pl
@@ -1,5 +1,4 @@
#!/usr/bin/perl
-use lib (split(/:/, $ENV{GITPERLLIB}));
use warnings;
use strict;