mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY

Browse Source 
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>
This commit is contained in:
John Keeping
2013-04-26 19:55:52 +01:00
committed by Junio C Hamano
parent 4a9a4f0ec1
commit 54bb9015c8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/Makefile
View File

@ -15,9 +15,16 @@ PROVE ?= prove
DEFAULT_TEST_TARGET ?= test DEFAULT_TEST_TARGET ?= test
TEST_LINT ?= test-lint-duplicates test-lint-executable TEST_LINT ?= test-lint-duplicates test-lint-executable
ifdef TEST_OUTPUT_DIRECTORY
TEST_RESULTS_DIRECTORY = $(TEST_RESULTS_DIRECTORY)/test-results
else
TEST_RESULTS_DIRECTORY = test-results
endif
# Shell quote; # Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
TEST_RESULTS_DIRECTORY_SQ = $(subst ','\'',$(TEST_RESULTS_DIRECTORY))
T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)) T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
TSVN = $(sort $(wildcard t91[0-9][0-9]-*.sh)) TSVN = $(sort $(wildcard t91[0-9][0-9]-*.sh))
@ -36,10 +43,10 @@ $(T):
@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS) @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
pre-clean: pre-clean:
$(RM) -r test-results $(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
clean-except-prove-cache: clean-except-prove-cache:
$(RM) -r 'trash directory'.* test-results $(RM) -r 'trash directory'.* '$(TEST_RESULTS_DIRECTORY_SQ)'
$(RM) -r valgrind/bin $(RM) -r valgrind/bin
clean: clean-except-prove-cache clean: clean-except-prove-cache
@ -65,7 +72,7 @@ aggregate-results-and-cleanup: $(T)
$(MAKE) clean $(MAKE) clean
aggregate-results: aggregate-results:
for f in test-results/t*-*.counts; do \ for f in '$(TEST_RESULTS_DIRECTORY_SQ)'/t*-*.counts; do \
echo "$$f"; \ echo "$$f"; \
done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh