Skip to content

Commit 54a466a

Browse files
joaocgreisMylesBorins
authored andcommittedDec 16, 2019
build,win: add test-ci-native and test-ci-js
Backport-PR-URL: #30726 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 f9b31ed commit 54a466a

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed
 

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,7 @@ test-all: test-build ## Run everything in test/.
425425
test-all-valgrind: test-build
426426
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=debug,release --valgrind
427427

428+
# CI_* variables should be kept synchronized with the ones in vcbuild.bat
428429
CI_NATIVE_SUITES ?= addons addons-napi
429430
CI_JS_SUITES ?= default
430431
CI_DOC := doctool

‎vcbuild.bat

+9-2
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 addons-napi
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_addons_napi=1"
24+
1825
@rem Process arguments.
1926
set config=Release
2027
set target=Build
@@ -52,10 +59,8 @@ set enable_static=
5259
set build_addons_napi=
5360
set test_node_inspect=
5461
set test_check_deopts=
55-
set js_test_suites=default
5662
set v8_test_options=
5763
set v8_build_options=
58-
set "common_test_suites=%js_test_suites% doctool addons addons-napi&set build_addons=1&set build_addons_napi=1"
5964
set http2_debug=
6065
set nghttp2_debug=
6166
set link_module=
@@ -88,6 +93,8 @@ if /i "%1"=="nopch" set "pch="&goto arg-ok
8893
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
8994
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
9095
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap %common_test_suites%&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&goto arg-ok
96+
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_addons_napi=1&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&goto arg-ok
97+
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
9198
if /i "%1"=="build-addons" set build_addons=1&goto arg-ok
9299
if /i "%1"=="build-addons-napi" set build_addons_napi=1&goto arg-ok
93100
if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok

0 commit comments

Comments
 (0)
Please sign in to comment.