git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/2] test-lib.sh: Allow running the test suite against installed git
Date: Fri, 13 Mar 2009 16:45:16 +0100	[thread overview]
Message-ID: <1236959116-3334-3-git-send-email-git@drmicha.warpmail.net> (raw)
In-Reply-To: <1236959116-3334-2-git-send-email-git@drmicha.warpmail.net>

Introduce variables externalpath and externalexecpath such that the test
suite can be run against a git which is installed at $externalpath with
subcommands at $externalexecpath. externalpath defaults to the git.git
checkout, externalexecpath defaults to $externalpath. Run the suite as

externalpath=somepath externalexecpath=someotherpath make test

but note that this requires and uses parts of a compiled git in the
git.git checkout: test helpers, templates and perl libraries are taken
from there.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 t/test-lib.sh |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index b9da86e..f6c467f 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -514,8 +514,14 @@ test_done () {
 TEST_DIRECTORY=$(pwd)
 if test -z "$valgrind"
 then
-	PATH=$TEST_DIRECTORY/..:$PATH
-	GIT_EXEC_PATH=$TEST_DIRECTORY/..
+	if test -z "$externalpath"
+	then
+		PATH=$TEST_DIRECTORY/..:$PATH
+		GIT_EXEC_PATH=$TEST_DIRECTORY/..
+	else
+		PATH=$externalpath:$TEST_DIRECTORY/..:$PATH
+		GIT_EXEC_PATH=${externalexecpath:-$externalpath}
+	fi
 else
 	make_symlink () {
 		test -h "$2" &&
-- 
1.6.2.149.g6462

  reply	other threads:[~2009-03-13 15:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-13 15:45 [PATCH 0/2] Allow running the test suite against installed git Michael J Gruber
2009-03-13 15:45 ` [PATCH 1/2] test-lib.sh: Test for presence of git-init in the right path Michael J Gruber
2009-03-13 15:45   ` Michael J Gruber [this message]
2009-03-14 20:25     ` [PATCH 2/2] test-lib.sh: Allow running the test suite against installed git Junio C Hamano
2009-03-16 17:03       ` [PATCHv2 0/2] " Michael J Gruber
2009-03-16 17:03       ` [PATCHv2 1/2] test-lib.sh: Test for presence of git-init in the right path Michael J Gruber
2009-03-16 17:03       ` [PATCHv2 2/2] test-lib.sh: Allow running the test suite against installed git Michael J Gruber

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

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

  git send-email \
    --in-reply-to=1236959116-3334-3-git-send-email-git@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
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 NNTP newsgroup(s).