Skip to content

Commit 6a53152

Browse files
joaocgreistargos
authored andcommitted
build,win: add test-ci-native and test-ci-js
PR-URL: #30724 Refs: nodejs/build#1996 Reviewed-By: Rod Vagg <[email protected]> Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 3d302ff commit 6a53152

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ test-all-valgrind: test-build
489489
test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run all test suites.
490490
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) test/*
491491

492+
# CI_* variables should be kept synchronized with the ones in vcbuild.bat
492493
CI_NATIVE_SUITES ?= addons js-native-api node-api
493494
CI_JS_SUITES ?= default
494495
ifeq ($(node_use_openssl), false)

‎vcbuild.bat‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ if /i "%1"=="/?" goto help
1515

1616
cd%~dp0
1717

18+
@rem CI_* variables should be kept synchronized with the ones in Makefile
19+
setCI_NATIVE_SUITES=addons js-native-api node-api
20+
setCI_JS_SUITES=default
21+
setCI_DOC=doctool
22+
@rem Same as the test-ci target in Makefile
23+
set"common_test_suites=%CI_JS_SUITES%%CI_NATIVE_SUITES%%CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1"
24+
1825
@rem Process arguments.
1926
setconfig=Release
2027
settarget=Build
@@ -51,10 +58,8 @@ set build_js_native_api_tests=
5158
setbuild_node_api_tests=
5259
settest_node_inspect=
5360
settest_check_deopts=
54-
setjs_test_suites=default
5561
setv8_test_options=
5662
setv8_build_options=
57-
set"common_test_suites=%js_test_suites% doctool addons js-native-api node-api&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1"
5863
sethttp2_debug=
5964
setnghttp2_debug=
6065
setlink_module=
@@ -86,8 +91,8 @@ if /i "%1"=="noetw" set noetw=1&goto arg-ok
8691
if /i "%1"=="ltcg"setltcg=1&goto arg-ok
8792
if /i "%1"=="licensertf"setlicensertf=1&goto arg-ok
8893
if /i "%1"=="test"settest_args=%test_args% -J %common_test_suites%&set lint_cpp=1&set lint_js=1&set lint_md=1&goto arg-ok
89-
::test-ci is deprecated
90-
if /i "%1"=="test-ci"goto arg-ok
94+
if /i "%1"=="test-ci-native"settest_args=%test_args%%test_ci_args% -J -p tap --logfile test.tap %CI_NATIVE_SUITES%%CI_DOC%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1&set cctest_args=%cctest_args% --gtest_output=xml:cctest.junit.xml&goto arg-ok
95+
if /i "%1"=="test-ci-js"settest_args=%test_args%%test_ci_args% -J -p tap --logfile test.tap %CI_JS_SUITES%&set no_cctest=1&goto arg-ok
9196
if /i "%1"=="build-addons"setbuild_addons=1&goto arg-ok
9297
if /i "%1"=="build-js-native-api-tests"setbuild_js_native_api_tests=1&goto arg-ok
9398
if /i "%1"=="build-node-api-tests"setbuild_node_api_tests=1&goto arg-ok

0 commit comments

Comments
(0)