aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-08-26 11:16:25 -0700
committerJunio C Hamano <gitster@pobox.com>2014-08-26 11:16:25 -0700
commit212d781c967317a05a704609ddf3ffc8a09f8590 (patch)
tree27ebe6a7d0915fc00c408137d6c499e0f196c0e2
parentc285171dacb2e3fbcb644ad16b14b2cb1875947d (diff)
parent93b5393611e9e1892e2eaea9b844c505172ac460 (diff)
downloadgit-212d781c967317a05a704609ddf3ffc8a09f8590.tar.gz
git-212d781c967317a05a704609ddf3ffc8a09f8590.tar.xz
Merge branch 'jk/fix-profile-feedback-build'
Fix profile-feedback build broken in 2.1 for tarball releases. * jk/fix-profile-feedback-build: Makefile: make perf tests optional for profile build
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2320de592..9f984a9e5 100644
--- 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