File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -209,6 +209,7 @@ test-ci-js:
209209 $(TEST_CI_ARGS ) $(CI_JS_SUITES )
210210
211211test-ci : | build-addons
212+ out/Release/cctest --gtest_output=tap:cctest.tap
212213 $(PYTHON ) tools/test.py $(PARALLEL_ARGS ) -p tap --logfile test.tap \
213214 --mode=release --flaky-tests=$(FLAKY_TESTS ) \
214215 $(TEST_CI_ARGS ) $(CI_NATIVE_SUITES ) $(CI_JS_SUITES )
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ set noprojgen=
2020set nobuild =
2121set nosign =
2222set nosnapshot =
23+ set cctest_args =
2324set test_args =
2425set package =
2526set msi =
@@ -56,7 +57,7 @@ if /i "%1"=="noetw" set noetw=1&goto arg-ok
5657if /i " %1 " == " noperfctr" set noperfctr = 1& goto arg-ok
5758if /i " %1 " == " licensertf" set licensertf = 1& goto arg-ok
5859if /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
59- 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
60+ 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
6061if /i " %1 " == " test-addons" set test_args = %test_args% addons& set build_addons=1& goto arg-ok
6162if /i " %1 " == " test-simple" set test_args = %test_args% sequential parallel -J& goto arg-ok
6263if /i " %1 " == " test-message" set test_args = %test_args% message& goto arg-ok
@@ -333,8 +334,8 @@ goto run-tests
333334if " %test_args% " == " " goto jslint
334335if " %config% " == " Debug" set test_args = --mode=debug %test_args%
335336if " %config% " == " Release" set test_args = --mode=release %test_args%
336- echo running 'cctest'
337- " %config% \cctest"
337+ echo running 'cctest %cctest_args% '
338+ " %config% \cctest" %cctest_args%
338339echo running 'python tools\test.py %test_args% '
339340python tools\test.py %test_args%
340341goto jslint
You can’t perform that action at this time.
0 commit comments