Andrew's git / gitweb.git / diff
?
Merge branch 'jk/fix-profile-feedback-build'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:25 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Aug 2014 18:16:25 +0000 (11:16 -0700)
Fix profile-feedback build broken in 2.1 for tarball releases.

* jk/fix-profile-feedback-build:
Makefile: make perf tests optional for profile build

Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index 2320de592e6dbc545866e6bfef09a05f660c2c14..9f984a9e5561d6b67b453124a311963ae8845f6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1659,7 +1659,11 @@ endif
 profile:: profile-clean
        $(MAKE) PROFILE=GEN all
        $(MAKE) PROFILE=GEN -j1 test
-       $(MAKE) PROFILE=GEN -j1 perf
+       @if test -n "$$GIT_PERF_REPO" || test -d .git; then \
+               $(MAKE) PROFILE=GEN -j1 perf; \
+       else \
+               echo "Skipping profile of perf tests..."; \
+       fi
        $(MAKE) PROFILE=USE all
 
 profile-fast: profile-clean