Browse Source

build: run cctests as part of test-ci target

Enable the cctests on the CI now that they know how to write TAP output.

PR-URL: https://github.com/nodejs/node/pull/8034
Reviewed-By: James M Snell <jasnell@gmail.com>
v7.x
Ben Noordhuis 9 years ago
committed by James M Snell
parent
commit
4cd3090056
  1. 1
      Makefile
  2. 7
      vcbuild.bat

1
Makefile

@ -211,6 +211,7 @@ test-ci-js:
$(TEST_CI_ARGS) $(CI_JS_SUITES) $(TEST_CI_ARGS) $(CI_JS_SUITES)
test-ci: | build-addons test-ci: | build-addons
out/Release/cctest --gtest_output=tap:cctest.tap
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
--mode=release --flaky-tests=$(FLAKY_TESTS) \ --mode=release --flaky-tests=$(FLAKY_TESTS) \
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES) $(CI_JS_SUITES) $(TEST_CI_ARGS) $(CI_NATIVE_SUITES) $(CI_JS_SUITES)

7
vcbuild.bat

@ -20,6 +20,7 @@ set noprojgen=
set nobuild= set nobuild=
set nosign= set nosign=
set nosnapshot= set nosnapshot=
set cctest_args=
set test_args= set test_args=
set package= set package=
set msi= set msi=
@ -56,7 +57,7 @@ if /i "%1"=="noetw" set noetw=1&goto arg-ok
if /i "%1"=="noperfctr" set noperfctr=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"=="licensertf" set licensertf=1&goto arg-ok
if /i "%1"=="test" set test_args=%test_args% addons doctool known_issues message parallel sequential -J&set jslint=1&set build_addons=1&goto arg-ok if /i "%1"=="test" set test_args=%test_args% addons doctool known_issues message parallel sequential -J&set jslint=1&set build_addons=1&goto arg-ok
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool inspector known_issues message sequential parallel&set build_addons=1&goto arg-ok if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool inspector known_issues message sequential parallel&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&goto arg-ok
if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&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-message" set test_args=%test_args% message&goto arg-ok
@ -333,8 +334,8 @@ goto run-tests
if "%test_args%"=="" goto jslint if "%test_args%"=="" goto jslint
if "%config%"=="Debug" set test_args=--mode=debug %test_args% if "%config%"=="Debug" set test_args=--mode=debug %test_args%
if "%config%"=="Release" set test_args=--mode=release %test_args% if "%config%"=="Release" set test_args=--mode=release %test_args%
echo running 'cctest' echo running 'cctest %cctest_args%'
"%config%\cctest" "%config%\cctest" %cctest_args%
echo running 'python tools\test.py %test_args%' echo running 'python tools\test.py %test_args%'
python tools\test.py %test_args% python tools\test.py %test_args%
goto jslint goto jslint

Loading…
Cancel
Save