Merge git-mv fixes from 'maint'

[git.git] / t / Makefile

diff --git a/t/Makefile b/t/Makefile
index 198c5ed..fe65f53 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -2,14 +2,28 @@
 #
 # Copyright (c) 2005 Junio C Hamano
 #
-#OPTS=--verbose --debug
-OPTS=
+
+#GIT_TEST_OPTS=--verbose --debug
+SHELL_PATH ?= $(SHELL)
+TAR ?= $(TAR)
+
+# Shell quote;
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 
-all::
-       @$(foreach t,$T,echo "*** $t ***"; sh $t $(OPTS) || exit; )
-       rm -fr trash
+ifdef NO_PYTHON
+       GIT_TEST_OPTS += --no-python
+endif
+
+all: $(T) clean
 
-clean::
+$(T):
+       @echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+
+clean:
        rm -fr trash
+
+.PHONY: $(T) clean
+.NOPARALLEL:
+