Skip to content

Commit

Permalink
tools: do not build addons during compilation
Browse files Browse the repository at this point in the history
The current makefile runs both `cctest` and `build-addons` in parallel
under the assumption that both rely on `all`. Unfortunately
`build-addons` does not rely on all, and there is an edge case where
by it is possible to call `build-addons` while compilation is still
happening.

This patch takes the simplest route by forcing `build-addons` and
`cctest` to run in sequence like the other test targets. This ensures
that `build-addons` will never be run during compilation.

It would be possible to modify `build-addons` to rely on `all` but it
would be a much more aggressive change to the MAKEFILE for a fairly
minor perf bump, as cctest is so fast.

PR-URL: #6723
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
Myles Borins authored and evanlucas committed May 17, 2016
1 parent 1370fdc commit 1de25f2
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ v8:
tools/make-v8.sh v8
$(MAKE) -C deps/v8 $(V8_ARCH) $(V8_BUILD_OPTIONS)

test: | build-addons cctest # Both targets depend on 'all'.
test: all
$(MAKE) build-addons
$(MAKE) cctest
$(PYTHON) tools/test.py --mode=release -J \
addon doctool message parallel sequential
$(MAKE) lint
Expand Down

0 comments on commit 1de25f2

Please sign in to comment.