summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-04-26 19:55:52 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-27 13:41:31 -0700
commit54bb9015c817728371b48e908257fdf6a078eb60 (patch)
treeb589daa16042d016230f16895dca99854a4ec140 /ll-merge.c
parentGit 1.8.2.2 (diff)
downloadtgif-54bb9015c817728371b48e908257fdf6a078eb60.tar.xz
t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY
When TEST_OUTPUT_DIRECTORY is set, the test results will be generated in "$TEST_OUTPUT_DIRECTORY/test-results", which may not be the same as "test-results" in t/Makefile. This causes the aggregate-results target to fail as it finds no count files. Fix this by introducing TEST_RESULTS_DIRECTORY and using it wherever test-results is referenced. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions