1 files changed, 6 insertions, 48 deletions
diff --git a/test/Makefile b/test/Makefile
index 7a29eaa1..b6859eac 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,49 +1,7 @@
-# Run tests
-#
-# Copyright (c) 2005 Junio C Hamano
-#
+# See Makfefile.local for the list of files to be compiled in this
+# directory.
+all:
+	$(MAKE) -C .. all
 
--include ../config.mak
-
-#GIT_TEST_OPTS=--verbose --debug
-SHELL=/bin/bash
-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
-	$(RM) t????/cvsroot/CVSROOT/?*
-	$(RM) -r valgrind/bin
-
-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
-
-valgrind:
-	GIT_TEST_OPTS=--valgrind $(MAKE)
-
-.PHONY: pre-clean $(T) aggregate-results clean valgrind
+.DEFAULT:
+	$(MAKE) -C .. $@