diff options
author | John Keeping <john@keeping.me.uk> | 2013-05-06 13:35:46 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-06 08:20:28 -0700 |
commit | b3e0c4ed07e9f76e501c67c3677776e4f257d274 (patch) | |
tree | aebb0cc0ee89486d89c39abce852d4333e824b06 /t/Makefile | |
parent | test output: respect $TEST_OUTPUT_DIRECTORY (diff) | |
download | tgif-b3e0c4ed07e9f76e501c67c3677776e4f257d274.tar.xz |
t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/Makefile')
-rw-r--r-- | t/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/Makefile b/t/Makefile index 11de5da765..ebb73719cb 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 |