Skip to content

Commit 7c73105

Browse files
bnoordhuisMyles Borins
authored and
Myles Borins
committedNov 22, 2016
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: #8034 Reviewed-By: James M Snell <[email protected]>
1 parent 4c47446 commit 7c73105

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed
 

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ test-ci-js:
192192
$(TEST_CI_ARGS) $(CI_JS_SUITES)
193193

194194
test-ci: | build-addons
195+
out/Release/cctest --gtest_output=tap:cctest.tap
195196
$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --flaky-tests=$(FLAKY_TESTS) \
196197
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES) $(CI_JS_SUITES)
197198

‎vcbuild.bat

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ set noprojgen=
2020
set nobuild=
2121
set nosign=
2222
set nosnapshot=
23+
set cctest_args=
2324
set test_args=
2425
set package=
2526
set msi=
@@ -57,7 +58,7 @@ if /i "%1"=="noetw" set noetw=1&goto arg-ok
5758
if /i "%1"=="noperfctr" set noperfctr=1&goto arg-ok
5859
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
5960
if /i "%1"=="test" set test_args=%test_args% addons doctool sequential parallel message -J&set jslint=1&set build_addons=1&goto arg-ok
60-
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool message sequential parallel&set build_addons=1&goto arg-ok
61+
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool message sequential parallel&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&goto arg-ok
6162
if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok
6263
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok
6364
if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok
@@ -354,8 +355,8 @@ goto run-tests
354355
if "%test_args%"=="" goto jslint
355356
if "%config%"=="Debug" set test_args=--mode=debug %test_args%
356357
if "%config%"=="Release" set test_args=--mode=release %test_args%
357-
echo running 'cctest'
358-
"%config%\cctest"
358+
echo running 'cctest %cctest_args%'
359+
"%config%\cctest" %cctest_args%
359360
echo running 'python tools\test.py %test_args%'
360361
python tools\test.py %test_args%
361362
goto jslint

0 commit comments

Comments
 (0)
Please sign in to comment.