mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: fix parallel "make test"

Browse Source 
When building the "test" target we depend on both cgit and building the
Git tools.  By doing this with two targets we end up running make in the
git/ directory twice, concurrently if using parallel make, which causes
us to build more than we need and potentially builds incorrectly if
multi-step build-then-move operations overlap.

Fix this by instead calling back into the makefile so that we alter the
"cgit" target to also build the Git tools.

Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
John Keeping 2013-05-18 15:17:08 +01:00 committed by Jason A. Donenfeld
parent f75900b04f
commit c2b79dd8e0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -64,12 +64,10 @@ endif
all:: cgit all:: cgit
cgit: cgit:
$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit NO_CURL=1 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit $(EXTRA_GIT_TARGETS) NO_CURL=1
git: test:
$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 @$(MAKE) --no-print-directory cgit EXTRA_GIT_TARGETS=all
test: all git
$(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
install: all install: all