From f7ea0adabd70bd6b1dede18c712906561153af8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Wed, 30 Dec 2015 16:01:54 +1100 Subject: [PATCH] test: enable parallel testing in test-ci Run tests in parallel by default in continuous integration. --- Makefile | 5 +++-- vcbuild.bat | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c337f006fb6f63..e8ef2d6718a3ef 100644 --- a/Makefile +++ b/Makefile @@ -144,8 +144,9 @@ test-all-valgrind: test-build $(PYTHON) tools/test.py --mode=debug,release --valgrind test-ci: | build-addons - $(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --flaky-tests=$(FLAKY_TESTS) \ - $(TEST_CI_ARGS) addons message parallel sequential + $(PYTHON) tools/test.py -p tap --logfile test.tap -J --mode=release \ + --flaky-tests=$(FLAKY_TESTS) $(TEST_CI_ARGS) \ + addons message parallel sequential test-release: test-build $(PYTHON) tools/test.py --mode=release diff --git a/vcbuild.bat b/vcbuild.bat index 260a86000b436d..beef9c86298f5e 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -55,7 +55,7 @@ if /i "%1"=="noetw" set noetw=1&goto arg-ok if /i "%1"=="noperfctr" set noperfctr=1&goto arg-ok if /i "%1"=="licensertf" set licensertf=1&goto arg-ok if /i "%1"=="test" set test_args=%test_args% sequential parallel message -J&set jslint=1&goto arg-ok -if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap message sequential parallel&goto arg-ok +if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap -J --logfile test.tap message sequential parallel&goto arg-ok if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok if /i "%1"=="test-gc" set test_args=%test_args% gc&set buildnodeweak=1&goto arg-ok