git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Todd Zullinger <tmz@pobox.com>
To: git@vger.kernel.org
Cc: "Luis Marsano" <luis.marsano@gmail.com>,
	"Ted Zlatanov" <tzz@lifelogs.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [RFC PATCH v2 3/4] git-credential-netrc: use in-tree Git.pm for tests
Date: Tue, 12 Jun 2018 23:10:38 -0400	[thread overview]
Message-ID: <20180613031040.3109-4-tmz@pobox.com> (raw)
In-Reply-To: <20180607051958.759-1-tmz@pobox.com>

From: Luis Marsano <luis.marsano@gmail.com>

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>
---
 contrib/credential/netrc/t-git-credential-netrc.sh | 3 ++-
 contrib/credential/netrc/test.pl                   | 1 -
 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;

  parent reply	other threads:[~2018-06-13  3:10 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-07  5:19 [RFC PATCH 0/2] contrib/credential/netrc Makefile & test improvements Todd Zullinger
2018-06-07  5:19 ` [RFC PATCH 1/2] git-credential-netrc: make "all" default target of Makefile Todd Zullinger
2018-06-07  5:19 ` [RFC PATCH 2/2] git-credential-netrc: use in-tree Git.pm for tests Todd Zullinger
2018-06-09 21:18 ` [RFC PATCH 0/2] contrib/credential/netrc Makefile & test improvements Luis Marsano
2018-06-10  2:28   ` Todd Zullinger
2018-06-10  8:36     ` Ævar Arnfjörð Bjarmason
2018-06-13  3:08       ` Todd Zullinger
2018-06-13  6:15         ` Luis Marsano
2018-06-13  7:48           ` [PATCH] git-credential-netrc: remove use of "autodie" Ævar Arnfjörð Bjarmason
2018-06-13 16:48             ` Junio C Hamano
2018-06-13 17:26               ` Todd Zullinger
2018-06-13  3:10 ` [RFC PATCH v2 0/4] contrib/credential/netrc Makefile & test improvements Todd Zullinger
2018-06-13  6:59   ` Luis Marsano
2018-06-13  3:10 ` [RFC PATCH v2 1/4] git-credential-netrc: make "all" default target of Makefile Todd Zullinger
2018-06-13  3:10 ` [RFC PATCH v2 2/4] git-credential-netrc: minor whitespace cleanup in test script Todd Zullinger
2018-06-13  5:42   ` Eric Sunshine
2018-06-13 17:21     ` Todd Zullinger
2018-06-13 17:43       ` Eric Sunshine
2018-06-13  3:10 ` Todd Zullinger [this message]
2018-06-13  3:10 ` [RFC PATCH v2 4/4] git-credential-netrc: fix exit status when tests fail Todd Zullinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180613031040.3109-4-tmz@pobox.com \
    --to=tmz@pobox.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=luis.marsano@gmail.com \
    --cc=tzz@lifelogs.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).