Skip to content

Commit

Permalink
Merge branch 'jk/fix-profile-feedback-build'
Browse files Browse the repository at this point in the history
Fix profile-feedback build broken in 2.1 for tarball releases.

* jk/fix-profile-feedback-build:
  Makefile: make perf tests optional for profile build
  • Loading branch information
Junio C Hamano committed Aug 26, 2014
2 parents c285171 + 93b5393 commit 212d781
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 212d781

Please sign in to comment.