From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sun, 8 Jun 2008 14:04:35 +0000 (+0200)
Subject: Hook up the result aggregation in the test makefile.
X-Git-Tag: v1.6.0-rc0~210^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f8d5ffc2c7c002cebb8842afcf58cbd4cea481b8;p=git.git

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>
---

diff --git a/t/Makefile b/t/Makefile
index dfa90ace1..a778865ae 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -14,18 +14,24 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 TSVN = $(wildcard t91[0-9][0-9]-*.sh)
 
-all: $(T) clean
+all: pre-clean $(T) aggregate-results clean
 
 $(T):
 	@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
 
+pre-clean:
+	$(RM) -r test-results
+
 clean:
 	$(RM) -r 'trash directory' test-results
 
+aggregate-results:
+	./aggregate-results.sh test-results/t*-*
+
 # we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
 full-svn-test:
 	$(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
 
-.PHONY: $(T) clean
+.PHONY: pre-clean $(T) aggregate-results clean
 .NOTPARALLEL: