threads / patch / 33732

patcht/Makefile: don't define TEST_RESULTS_DIRECTORY recursively

Subject: [PATCH] t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively

## tl;dr

2 messages between May 6, 2013 and May 6, 2013. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

John Keeping· May 6, 2013, 12:35 UTC · lore

Commit 54bb901 (t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY - 2013-04-26) incorrectly defined TEST_RESULTS_DIRECTORY relative to itself, when it should be relative to TEST_OUTPUT_DIRECTORY. Fix this.

Signed-off-by: John Keeping <john@keeping.me.uk>
---
 t/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/Makefile +1 −1

diff --git a/t/Makefile b/t/Makefile
index 11de5da..ebb7371 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -16,7 +16,7 @@ DEFAULT_TEST_TARGET ?= test
 TEST_LINT ?= test-lint-duplicates test-lint-executable
 
 ifdef TEST_OUTPUT_DIRECTORY
-TEST_RESULTS_DIRECTORY = $(TEST_RESULTS_DIRECTORY)/test-results
+TEST_RESULTS_DIRECTORY = $(TEST_OUTPUT_DIRECTORY)/test-results
 else
 TEST_RESULTS_DIRECTORY = test-results
 endif

-- 
1.8.3.rc0.149.g98a72f2.dirty

Junio C Hamano· May 6, 2013, 15:20 UTC · re: John Keeping · lore

Re: [PATCH] t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively

John Keeping <john@keeping.me.uk> writes:

Show 9 quoted lines

> Commit 54bb901 (t/Makefile: fix result handling with
> TEST_OUTPUT_DIRECTORY - 2013-04-26) incorrectly defined
> TEST_RESULTS_DIRECTORY relative to itself, when it should be relative to
> TEST_OUTPUT_DIRECTORY.  Fix this.
>
> Signed-off-by: John Keeping <john@keeping.me.uk>
> ---
>  t/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, I missed this one.

Show 13 quoted lines

> diff --git a/t/Makefile b/t/Makefile
> index 11de5da..ebb7371 100644
> --- a/t/Makefile
> +++ b/t/Makefile
> @@ -16,7 +16,7 @@ DEFAULT_TEST_TARGET ?= test
>  TEST_LINT ?= test-lint-duplicates test-lint-executable
>  
>  ifdef TEST_OUTPUT_DIRECTORY
> -TEST_RESULTS_DIRECTORY = $(TEST_RESULTS_DIRECTORY)/test-results
> +TEST_RESULTS_DIRECTORY = $(TEST_OUTPUT_DIRECTORY)/test-results
>  else
>  TEST_RESULTS_DIRECTORY = test-results
>  endif