From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
David Aguilar <davvid@gmail.com>,
Ilari Liusvaara <ilari.liusvaara@elisanet.fi>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 4/4] remote-helpers: add exec-path links
Date: Fri, 24 May 2013 21:38:27 -0500 [thread overview]
Message-ID: <1369449507-18269-5-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1369449507-18269-1-git-send-email-felipe.contreras@gmail.com>
This way we don't have to modify the PATH ourselves and it's easier to
test without 'make'.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
.gitignore | 2 ++
contrib/remote-helpers/Makefile | 13 +++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 10aee94..a79b412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,11 +119,13 @@
/git-reflog
/git-relink
/git-remote
+/git-remote-bzr
/git-remote-http
/git-remote-https
/git-remote-ftp
/git-remote-ftps
/git-remote-fd
+/git-remote-hg
/git-remote-ext
/git-remote-testgit
/git-remote-testpy
diff --git a/contrib/remote-helpers/Makefile b/contrib/remote-helpers/Makefile
index 55abf0b..98150b4 100644
--- a/contrib/remote-helpers/Makefile
+++ b/contrib/remote-helpers/Makefile
@@ -1,9 +1,9 @@
TESTS := $(wildcard test-*.t)
SCRIPTS := $(wildcard git-remote-*.py)
+LINKS := $(addprefix ../../,$(patsubst %.py,%,$(SCRIPTS)))
export T := $(addprefix $(CURDIR)/,$(TESTS))
export MAKE := $(MAKE) -e
-export PATH := $(CURDIR):$(PATH)
export TEST_LINT := test-lint-executable test-lint-shell-syntax
export TEST_DIRECTORY := $(CURDIR)/../../t
@@ -15,10 +15,15 @@ all: $(SCRIPTS)
install:
$(MAKE) -C ../.. install-python-script
-test: all
+links: all $(LINKS)
+
+test: links
$(MAKE) -C ../../t $@
-$(TESTS): all
+$(LINKS):
+ ln -sf contrib/remote-helpers/$(notdir $@) ../..
+
+$(TESTS): links
$(MAKE) -C ../../t $(CURDIR)/$@
-.PHONY: all install test $(TESTS)
+.PHONY: all install test links $(TESTS)
--
1.8.3.rc3.312.g47657de
next prev parent reply other threads:[~2013-05-25 2:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-25 2:38 [PATCH 0/4] remote-helpers: test reorganization Felipe Contreras
2013-05-25 2:38 ` [PATCH 1/4] remote-helpers: generate scripts Felipe Contreras
2013-05-25 2:38 ` [PATCH 2/4] remote-helpers: rename tests Felipe Contreras
2013-05-28 20:05 ` Junio C Hamano
2013-05-29 2:50 ` Felipe Contreras
2013-05-29 17:14 ` Junio C Hamano
2013-05-29 17:56 ` Felipe Contreras
2013-05-29 18:44 ` Junio C Hamano
2013-05-29 19:32 ` Felipe Contreras
2013-05-25 2:38 ` [PATCH 3/4] remote-helpers: allow direct test execution Felipe Contreras
2013-05-25 2:38 ` Felipe Contreras [this message]
2013-05-28 20:06 ` [PATCH 4/4] remote-helpers: add exec-path links Junio C Hamano
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=1369449507-18269-5-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ilari.liusvaara@elisanet.fi \
--cc=peff@peff.net \
/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).