merge-recursive: demonstrate an incorrect conflict with submodule
[git/dscho.git] / t / Makefile
blob25c559bb49d04586c69242cd7ef03713f0939e9d
1 # Run tests
3 # Copyright (c) 2005 Junio C Hamano
6 -include ../config.mak
8 #GIT_TEST_OPTS=--verbose --debug
9 SHELL_PATH ?= $(SHELL)
10 TAR ?= $(TAR)
11 RM ?= rm -f
13 # Shell quote;
14 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
16 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
17 TSVN = $(wildcard t91[0-9][0-9]-*.sh)
19 all: pre-clean
20 $(MAKE) aggregate-results-and-cleanup
22 $(T):
23 @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
25 pre-clean:
26 $(RM) -r test-results
28 clean:
29 $(RM) -r 'trash directory'.* test-results
30 $(RM) t????/cvsroot/CVSROOT/?*
31 $(RM) -r valgrind/bin
33 aggregate-results-and-cleanup: $(T)
34 $(MAKE) aggregate-results
35 $(MAKE) clean
37 aggregate-results:
38 '$(SHELL_PATH_SQ)' ./aggregate-results.sh test-results/t*-*
40 # we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
41 full-svn-test:
42 $(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
43 $(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
45 valgrind:
46 GIT_TEST_OPTS=--valgrind $(MAKE)
48 .PHONY: pre-clean $(T) aggregate-results clean valgrind