summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDavid A. Greene <greened@obbligato.org>2016-01-17 17:47:59 -0600
committerJunio C Hamano <gitster@pobox.com>2016-01-19 10:15:20 -0800
commit43cce5c8ed48ab955b3347f999cda7c1c33dde0a (patch)
tree09877bd8d8c0b275b7498d6a2920759826504c30 /contrib
parent754884255bb580df159e58defa81cdd30b5c430c (diff)
downloadgit-43cce5c8ed48ab955b3347f999cda7c1c33dde0a.tar.gz
contrib/subtree: Make testing easierdg/subtree-test
Add some Makefile dependencies to ensure an updated git-subtree gets copied to the main area before testing begins. Signed-off-by: David A. Greene <greened@obbligato.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/subtree/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 3071baf493..6afa9aafdf 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -37,6 +37,7 @@ GIT_SUBTREE_DOC := git-subtree.1
GIT_SUBTREE_XML := git-subtree.xml
GIT_SUBTREE_TXT := git-subtree.txt
GIT_SUBTREE_HTML := git-subtree.html
+GIT_SUBTREE_TEST := ../../git-subtree
all:: $(GIT_SUBTREE)
@@ -71,7 +72,10 @@ $(GIT_SUBTREE_HTML): $(GIT_SUBTREE_TXT)
$(ASCIIDOC) -b xhtml11 -d manpage -f $(ASCIIDOC_CONF) \
-agit_version=$(GIT_VERSION) $^
-test:
+$(GIT_SUBTREE_TEST): $(GIT_SUBTREE)
+ cp $< $@
+
+test: $(GIT_SUBTREE_TEST)
$(MAKE) -C t/ test
clean: