mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
abc5d372ec
On multiprocessor machines, or with I/O heavy tests (that leave the CPU waiting a lot), it makes sense to parallelize the tests. However, care has to be taken that the different jobs use different trash directories. This commit does so, by creating the trash directories with a suffix that is unique with regard to the test, as it is the test's base name. Further, the trash directory is removed in the test itself if everything went fine, so that the trash directories do not pile up only to be removed at the very end. If a test failed, the trash directory is not removed. Chances are that the exact error message is lost in the clutter, but you can still see what test failed from the name of the trash directory, and repeat the test (without -j). If all was good, you will see the aggregated results. Suggestions to simplify this commit came from Junio and René. There still is an issue with tests that want to run a server process and listen to a fixed port (http and svn) --- they cannot run in parallel but this patch does not address this issue. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
42 lines
912 B
Makefile
42 lines
912 B
Makefile
# Run tests
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
#GIT_TEST_OPTS=--verbose --debug
|
|
SHELL_PATH ?= $(SHELL)
|
|
TAR ?= $(TAR)
|
|
RM ?= rm -f
|
|
|
|
# Shell quote;
|
|
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: pre-clean
|
|
$(MAKE) aggregate-results-and-cleanup
|
|
|
|
$(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-and-cleanup: $(T)
|
|
$(MAKE) aggregate-results
|
|
$(MAKE) clean
|
|
|
|
aggregate-results:
|
|
'$(SHELL_PATH_SQ)' ./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: pre-clean $(T) aggregate-results clean
|