Merge branch 'maint'

diff --git a/t/Makefile b/t/Makefile
index 66ceefefccac693d29077ef8020fc4f9dbe7a0bc..6091211f1009679aee741f3f6c2b290033aa5dc6 100644 (file)
--- a/t/Makefile
+++ b/t/Makefile
@@ -73,6 +73,9 @@ gitweb-test:
 valgrind:
        $(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"
 
+perf:
+       $(MAKE) -C perf/ all
+
 # Smoke testing targets
 -include ../GIT-VERSION-FILE
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo unknown')
@@ -111,4 +114,4 @@ smoke_report: smoke
                http://smoke.git.nix.is/app/projects/process_add_report/1 \
        | grep -v ^Redirecting
 
-.PHONY: pre-clean $(T) aggregate-results clean valgrind smoke smoke_report
+.PHONY: pre-clean $(T) aggregate-results clean valgrind perf