GeezerVison is showing github.com — build: run cctests as part of test-ci target · nodejs/node@7c73105
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: Makefile +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -192,6 +192,7 @@ test-ci-js: |
192 | 192 | $(TEST_CI_ARGS) $(CI_JS_SUITES) |
193 | 193 |
|
194 | 194 | test-ci: | build-addons |
| 195 | + out/Release/cctest --gtest_output=tap:cctest.tap |
195 | 196 | $(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --flaky-tests=$(FLAKY_TESTS) \ |
196 | 197 | $(TEST_CI_ARGS) $(CI_NATIVE_SUITES) $(CI_JS_SUITES) |
197 | 198 |
|
|
Collapse file
Copy file name to clipboardExpand all lines: vcbuild.bat +4-3Lines changed: 4 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -20,6 +20,7 @@ set noprojgen= |
20 | 20 | set nobuild= |
21 | 21 | set nosign= |
22 | 22 | set nosnapshot= |
| 23 | +set cctest_args= |
23 | 24 | set test_args= |
24 | 25 | set package= |
25 | 26 | set msi= |
@@ -57,7 +58,7 @@ if /i "%1"=="noetw" set noetw=1&goto arg-ok |
57 | 58 | if /i "%1"=="noperfctr" set noperfctr=1&goto arg-ok |
58 | 59 | if /i "%1"=="licensertf" set licensertf=1&goto arg-ok |
59 | 60 | 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 |
61 | 62 | if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok |
62 | 63 | if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok |
63 | 64 | if /i "%1"=="test-message" set test_args=%test_args% message&goto arg-ok |
@@ -354,8 +355,8 @@ goto run-tests |
354 | 355 | if "%test_args%"=="" goto jslint |
355 | 356 | if "%config%"=="Debug" set test_args=--mode=debug %test_args% |
356 | 357 | 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% |
359 | 360 | echo running 'python tools\test.py %test_args%' |
360 | 361 | python tools\test.py %test_args% |
361 | 362 | goto jslint |
|