Skip to content

Commit 8dd5eec

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 <rod@vagg.org> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 98799d4 commit 8dd5eec

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Makefile

+1
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

+9-4
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+
set CI_NATIVE_SUITES=addons js-native-api node-api
20+
set CI_JS_SUITES=default
21+
set CI_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
set config=Release
2027
set target=Build
@@ -51,10 +58,8 @@ set build_js_native_api_tests=
5158
set build_node_api_tests=
5259
set test_node_inspect=
5360
set test_check_deopts=
54-
set js_test_suites=default
5561
set v8_test_options=
5662
set v8_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
set http2_debug=
5964
set nghttp2_debug=
6065
set link_module=
@@ -86,8 +91,8 @@ if /i "%1"=="noetw" set noetw=1&goto arg-ok
8691
if /i "%1"=="ltcg" set ltcg=1&goto arg-ok
8792
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
8893
if /i "%1"=="test" set test_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" set test_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" set test_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" set build_addons=1&goto arg-ok
9297
if /i "%1"=="build-js-native-api-tests" set build_js_native_api_tests=1&goto arg-ok
9398
if /i "%1"=="build-node-api-tests" set build_node_api_tests=1&goto arg-ok

0 commit comments

Comments
 (0)