1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: allow test-ci to run tests in parallel

Browse Source 
Run tests in parallel if the environment variable JOBS
(which should contain a number of parallel jobs) is set.

PR-URL: https://github.com/nodejs/node/pull/6208
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Johan Bergström 2016-04-15 12:15:40 +09:00
parent 4a74fc9776
commit f49a1d0501
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -8,9 +8,12 @@ PREFIX ?= /usr/local
FLAKY_TESTS ?= run FLAKY_TESTS ?= run
TEST_CI_ARGS ?= TEST_CI_ARGS ?=
STAGINGSERVER ?= node-www STAGINGSERVER ?= node-www
OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]') OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
ifdef JOBS
PARALLEL_ARGS = -j $(JOBS)
endif
ifdef QUICKCHECK ifdef QUICKCHECK
QUICKCHECK_ARG := --quickcheck QUICKCHECK_ARG := --quickcheck
endif endif
@ -168,7 +171,8 @@ test-all-valgrind: test-build
$(PYTHON) tools/test.py --mode=debug,release --valgrind $(PYTHON) tools/test.py --mode=debug,release --valgrind
test-ci: | build-addons test-ci: | build-addons
$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --flaky-tests=$(FLAKY_TESTS) \ $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
--mode=release --flaky-tests=$(FLAKY_TESTS) \
$(TEST_CI_ARGS) addons message parallel sequential $(TEST_CI_ARGS) addons message parallel sequential
test-release: test-build test-release: test-build
@ -607,8 +611,9 @@ jslint:
tools/eslint-rules tools/jslint.js tools/eslint-rules tools/jslint.js
jslint-ci: jslint-ci:
$(NODE) tools/jslint.js -f tap -o test-eslint.tap benchmark lib src test \ $(NODE) tools/jslint.js $(PARALLEL_ARGS) -f tap -o test-eslint.tap \
tools/doc tools/eslint-rules tools/jslint.js benchmark lib src test tools/doc \
tools/eslint-rules tools/jslint.js
CPPLINT_EXCLUDE ?= CPPLINT_EXCLUDE ?=
CPPLINT_EXCLUDE += src/node_lttng.cc CPPLINT_EXCLUDE += src/node_lttng.cc