From 65dd10e9c028020d1a09fc36a02a4412b95d6cce Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Tue, 28 Apr 2015 15:01:20 +1000 Subject: [PATCH] build: remove -J from test-ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit parallel tests still not working on most build slaves PR-URL: https://github.com/iojs/io.js/pull/1544 PORT-PR-URL: https://github.com/iojs/io.js/pull/1560 PORT-FROM: v2.x / 2a3c8c187e4462f93169b6c98bea552edcace972 Reviewed-By: Johan Bergström --- Makefile | 2 +- vcbuild.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c714e95a857c28..8fc67d604e91b0 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ test-all-valgrind: test-build $(PYTHON) tools/test.py --mode=debug,release --valgrind test-ci: - $(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release -J message parallel sequential + $(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release message parallel sequential $(MAKE) jslint $(MAKE) cpplint diff --git a/vcbuild.bat b/vcbuild.bat index 2cf94ad5fdf370..97d6ba3bbc5511 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -52,7 +52,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% -p tap --logfile test.tap -J message sequential parallel&set jslint=1&goto arg-ok +if /i "%1"=="test-ci" set test_args=%test_args% -p tap --logfile test.tap message sequential parallel&set jslint=1&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