2005-05-14 05:50:32 +00:00
|
|
|
# Run tests
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
|
#
|
2005-05-14 15:58:22 +00:00
|
|
|
|
2010-05-14 09:31:38 +00:00
|
|
|
-include ../config.mak.autogen
|
2009-08-09 08:50:37 +00:00
|
|
|
-include ../config.mak
|
|
|
|
|
|
2012-12-09 10:36:17 +00:00
|
|
|
#GIT_TEST_OPTS = --verbose --debug
|
2005-09-24 19:50:29 +00:00
|
|
|
SHELL_PATH ?= $(SHELL)
|
2010-08-08 14:49:26 +00:00
|
|
|
PERL_PATH ?= /usr/bin/perl
|
2005-09-30 20:31:16 +00:00
|
|
|
TAR ?= $(TAR)
|
2007-07-14 17:51:44 +00:00
|
|
|
RM ?= rm -f
|
2010-10-14 08:53:36 +00:00
|
|
|
PROVE ?= prove
|
|
|
|
|
DEFAULT_TEST_TARGET ?= test
|
2014-07-09 19:34:42 +00:00
|
|
|
TEST_LINT ?= test-lint
|
2005-05-14 05:50:32 +00:00
|
|
|
|
2013-04-26 18:55:52 +00:00
|
|
|
ifdef TEST_OUTPUT_DIRECTORY
|
2013-05-06 12:35:46 +00:00
|
|
|
TEST_RESULTS_DIRECTORY = $(TEST_OUTPUT_DIRECTORY)/test-results
|
2013-04-26 18:55:52 +00:00
|
|
|
else
|
|
|
|
|
TEST_RESULTS_DIRECTORY = test-results
|
|
|
|
|
endif
|
|
|
|
|
|
2005-10-10 20:50:01 +00:00
|
|
|
# Shell quote;
|
2006-02-18 11:40:22 +00:00
|
|
|
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
|
2013-01-02 23:20:19 +00:00
|
|
|
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
|
2013-04-26 18:55:52 +00:00
|
|
|
TEST_RESULTS_DIRECTORY_SQ = $(subst ','\'',$(TEST_RESULTS_DIRECTORY))
|
2005-10-10 20:50:01 +00:00
|
|
|
|
t/Makefile: Use $(sort ...) explicitly where needed
Starting from GNU Make 3.82 $(wildcard ...) no longer sorts the result
(from NEWS):
* WARNING: Backward-incompatibility!
Wildcards were not documented as returning sorted values, but the results
have been sorted up until this release.. If your makefiles require sorted
results from wildcard expansions, use the $(sort ...) function to request
it explicitly.
http://repo.or.cz/w/make.git/commitdiff/2a59dc32aaf0681dec569f32a9d7ab88a379d34f
I usually watch test progress visually, and if tests are sorted, even
with make -j4 they go more or less incrementally by their t number. On
the other side, without sorting, tests are executed in seemingly random
order even for -j1. Let's please maintain sane tests order for perceived
prettyness.
Another note is that in GNU Make sort also works as uniq, so after sort
being removed, we might expect e.g. $(wildcard *.sh a.*) to produce
duplicates for e.g. "a.sh". From this point of view, adding sort could
be seen as hardening t/Makefile from accidentally introduced dups.
It turned out that prevous releases of GNU Make did not perform full
sort in $(wildcard), only sorting results for each pattern, that's why
explicit sort-as-uniq is relevant even for older makes.
Signed-off-by: Kirill Smelkov <kirr@navytux.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-09-03 20:41:21 +00:00
|
|
|
T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
|
|
|
|
|
TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh))
|
2014-07-09 19:34:12 +00:00
|
|
|
THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh)))
|
2005-05-14 05:50:32 +00:00
|
|
|
|
2010-10-14 08:53:36 +00:00
|
|
|
all: $(DEFAULT_TEST_TARGET)
|
|
|
|
|
|
2010-12-13 17:22:38 +00:00
|
|
|
test: pre-clean $(TEST_LINT)
|
tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
The Makefile targets 'aggregate-results' and 'clean' pretended to be
independent. This is not true, of course, since aggregate-results
needs the results _before_ they are removed.
Likewise, the tests should have been run already when the results are
to be aggregated.
However, as it is legitimate to run only a few tests, and then aggregate
just those results, so another target is introduced, that depends on all
tests, then aggregates the results, and only then removes the results.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-08 05:59:18 +00:00
|
|
|
$(MAKE) aggregate-results-and-cleanup
|
2005-11-08 09:51:10 +00:00
|
|
|
|
2010-12-13 17:22:38 +00:00
|
|
|
prove: pre-clean $(TEST_LINT)
|
2014-03-20 23:13:21 +00:00
|
|
|
@echo "*** prove ***"; $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
|
2012-05-02 15:31:52 +00:00
|
|
|
$(MAKE) clean-except-prove-cache
|
2010-10-14 08:53:36 +00:00
|
|
|
|
2005-11-08 09:51:10 +00:00
|
|
|
$(T):
|
2014-03-20 23:13:21 +00:00
|
|
|
@echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
|
2005-05-14 05:50:32 +00:00
|
|
|
|
2008-06-08 14:04:35 +00:00
|
|
|
pre-clean:
|
2013-04-26 18:55:52 +00:00
|
|
|
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
|
2008-06-08 14:04:35 +00:00
|
|
|
|
2012-05-02 15:31:52 +00:00
|
|
|
clean-except-prove-cache:
|
2013-04-26 18:55:52 +00:00
|
|
|
$(RM) -r 'trash directory'.* '$(TEST_RESULTS_DIRECTORY_SQ)'
|
2010-03-13 20:41:20 +00:00
|
|
|
$(RM) -r valgrind/bin
|
2012-05-02 15:31:52 +00:00
|
|
|
|
|
|
|
|
clean: clean-except-prove-cache
|
2010-07-23 22:58:44 +00:00
|
|
|
$(RM) .prove
|
2005-11-08 09:51:10 +00:00
|
|
|
|
2013-01-02 23:20:19 +00:00
|
|
|
test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax
|
2010-12-13 17:22:38 +00:00
|
|
|
|
|
|
|
|
test-lint-duplicates:
|
|
|
|
|
@dups=`echo $(T) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \
|
|
|
|
|
test -z "$$dups" || { \
|
|
|
|
|
echo >&2 "duplicate test numbers:" $$dups; exit 1; }
|
|
|
|
|
|
|
|
|
|
test-lint-executable:
|
|
|
|
|
@bad=`for i in $(T); do test -x "$$i" || echo $$i; done` && \
|
|
|
|
|
test -z "$$bad" || { \
|
|
|
|
|
echo >&2 "non-executable tests:" $$bad; exit 1; }
|
|
|
|
|
|
2013-01-02 23:20:19 +00:00
|
|
|
test-lint-shell-syntax:
|
2014-07-09 19:34:12 +00:00
|
|
|
@'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T) $(THELPERS)
|
2013-01-02 23:20:19 +00:00
|
|
|
|
tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
The Makefile targets 'aggregate-results' and 'clean' pretended to be
independent. This is not true, of course, since aggregate-results
needs the results _before_ they are removed.
Likewise, the tests should have been run already when the results are
to be aggregated.
However, as it is legitimate to run only a few tests, and then aggregate
just those results, so another target is introduced, that depends on all
tests, then aggregates the results, and only then removes the results.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-08 05:59:18 +00:00
|
|
|
aggregate-results-and-cleanup: $(T)
|
|
|
|
|
$(MAKE) aggregate-results
|
|
|
|
|
$(MAKE) clean
|
|
|
|
|
|
2008-06-08 14:04:35 +00:00
|
|
|
aggregate-results:
|
2013-04-26 18:55:52 +00:00
|
|
|
for f in '$(TEST_RESULTS_DIRECTORY_SQ)'/t*-*.counts; do \
|
2010-06-02 00:13:44 +00:00
|
|
|
echo "$$f"; \
|
|
|
|
|
done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh
|
2008-06-08 14:04:35 +00:00
|
|
|
|
2010-09-26 13:02:26 +00:00
|
|
|
gitweb-test:
|
|
|
|
|
$(MAKE) $(TGITWEB)
|
|
|
|
|
|
2009-02-03 23:26:18 +00:00
|
|
|
valgrind:
|
2011-06-17 08:29:57 +00:00
|
|
|
$(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"
|
2009-02-03 23:26:18 +00:00
|
|
|
|
2012-02-17 10:25:09 +00:00
|
|
|
perf:
|
|
|
|
|
$(MAKE) -C perf/ all
|
|
|
|
|
|
|
|
|
|
.PHONY: pre-clean $(T) aggregate-results clean valgrind perf
|