diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2014-09-25 19:01:52 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2014-09-25 19:01:52 +0100 |
| commit | acb67fee6eccb4924e6bc48165b256d09ec09a26 (patch) | |
| tree | 71ff063fe3142b63bf405869e2510ad3afb29c47 | |
| parent | 5231f84bce93df69e660d21dd1318289c4107b27 (diff) | |
tests: parallelise 'make valgrind'
Use $(MAKE) instead of 'make' inside the Makefile,
otherwise the make will run as if -j1 had been
specified and complain about the job server not
being available, and with $(MAKE) in inherits the
parent make's settings it seems.
Upgrade common submodule for parallel check-valgrind.
Let this settle a bit before upgrading the other modules.
| -rw-r--r-- | Makefile.am | 6 | ||||
| m--------- | common | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 823c4cb44..ca6071dcb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,13 +85,13 @@ endif if HAVE_CHECK check-valgrind: - cd tests/check && make check-valgrind + $(MAKE) -C tests/check check-valgrind check-torture: - cd tests/check && make torture + $(MAKE) -C tests/check torture build-checks: - cd tests/check && make build-checks + $(MAKE) -C tests/check build-checks else check-valgrind: echo "'check' library not installed, skipping" diff --git a/common b/common -Subproject 36388a18d37d72f9633bf1a8c06d18d310d215b +Subproject 6e754981c5e37a79e35dce01ce0130d5f1eff21 |