Skip to content

Commit

Permalink
build: remove -J from test-ci
Browse files Browse the repository at this point in the history
parallel tests still not working on most build slaves

PR-URL: #1544
PORT-PR-URL: #1560
PORT-FROM: v2.x / 2a3c8c1
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
  • Loading branch information
rvagg authored and Fishrock123 committed May 14, 2015
1 parent 5896fe5 commit 65dd10e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 65dd10e

Please sign in to comment.