Hook up the result aggregation in the test makefile.
This patch makes 'make' output the aggregated results at the end of each build. The 'git-test-result' file is removed both before and after each build. Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0a392cb8cb
commit
f8d5ffc2c7
10
t/Makefile
10
t/Makefile
@ -14,18 +14,24 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
|
|||||||
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
|
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
|
||||||
TSVN = $(wildcard t91[0-9][0-9]-*.sh)
|
TSVN = $(wildcard t91[0-9][0-9]-*.sh)
|
||||||
|
|
||||||
all: $(T) clean
|
all: pre-clean $(T) aggregate-results clean
|
||||||
|
|
||||||
$(T):
|
$(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:
|
||||||
|
$(RM) -r test-results
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) -r 'trash directory' test-results
|
$(RM) -r 'trash directory' test-results
|
||||||
|
|
||||||
|
aggregate-results:
|
||||||
|
./aggregate-results.sh test-results/t*-*
|
||||||
|
|
||||||
# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
|
# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
|
||||||
full-svn-test:
|
full-svn-test:
|
||||||
$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
|
$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
|
||||||
$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
|
$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
|
||||||
|
|
||||||
.PHONY: $(T) clean
|
.PHONY: pre-clean $(T) aggregate-results clean
|
||||||
.NOTPARALLEL:
|
.NOTPARALLEL:
|
||||||
|
Loading…
Reference in New Issue
Block a user