threads / patch / 41209

patchcontrib/subtree: Make testing easier

Subject: [PATCH 1/1] contrib/subtree: Make testing easier

## tl;dr

2 messages between Jan 17, 2016 and Jan 20, 2016. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

David Greene· Jan 17, 2016, 23:47 UTC · lore

From: David A. Greene <greened@obbligato.org>

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>
---

Notes:
    v1 - Initial patch

 contrib/subtree/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Show changes to contrib/subtree/Makefile +5 −1

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 3071baf..6afa9aa 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:

-- 
2.6.1

Junio C Hamano· Jan 20, 2016, 19:28 UTC · re: David Greene · lore

Re: [PATCH 1/1] contrib/subtree: Make testing easier

David Greene <greened@obbligato.org> writes:

Show 10 quoted lines

> From: David A. Greene <greened@obbligato.org>
>
> 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>
> ---
>
> Notes:
>     v1 - Initial patch

This looks OK to me, but does this change make what's written in contrib/subtree/INSTALL somewhat stale?

Show 28 quoted lines

>
>  contrib/subtree/Makefile | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
> index 3071baf..6afa9aa 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: