diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-08-26 18:16:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-08-26 18:16:25 (GMT) |
| commit | 212d781c967317a05a704609ddf3ffc8a09f8590 (patch) | |
| tree | 27ebe6a7d0915fc00c408137d6c499e0f196c0e2 /Makefile | |
| parent | c285171dacb2e3fbcb644ad16b14b2cb1875947d (diff) | |
| parent | 93b5393611e9e1892e2eaea9b844c505172ac460 (diff) | |
| download | git-212d781c967317a05a704609ddf3ffc8a09f8590.zip git-212d781c967317a05a704609ddf3ffc8a09f8590.tar.gz git-212d781c967317a05a704609ddf3ffc8a09f8590.tar.bz2 | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 |