summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-04-29 19:16:21 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-29 11:26:23 -0700
commit2d14e13c56a407eea6084ff2d5713a8d23d337f5 (patch)
tree6f58f7861ad192d448f3d10a93850e5a7fec32a2 /ll-merge.c
parentt/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY (diff)
downloadtgif-2d14e13c56a407eea6084ff2d5713a8d23d337f5.tar.xz
test output: respect $TEST_OUTPUT_DIRECTORY
Most test results go in $TEST_OUTPUT_DIRECTORY, but the output files for tests run with --tee or --valgrind just use bare "test-results". Changes these so that they do respect $TEST_OUTPUT_DIRECTORY. As a result of this, the valgrind/analyze.sh script may no longer inspect the correct files so it is also updated to respect $TEST_OUTPUT_DIRECTORY by adding it to GIT-BUILD-OPTIONS. This may be a regression for people who have TEST_OUTPUT_DIRECTORY in their config.mak but want to override it in the environment, but this change merely brings it into line with GIT_TEST_OPTS which already cannot be overridden if it is specified in config.mak. 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