Skip to content

Commit b967b4c

Browse files
refackaddaleax
authored andcommitted
build: merge test suite groups
PR-URL: #13378 Refs: #13340 Refs: #13336 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Andreas Madsen <[email protected]> Reviewed-By: João Reis <[email protected]>
1 parent 2c1133d commit b967b4c

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

vcbuild.bat

+6-4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ set enable_static=
4444
set build_addons_napi=
4545
set test_node_inspect=
4646
set test_check_deopts=
47+
set js_test_suites=inspector known_issues message parallel sequential
48+
set "common_test_suites=%js_test_suites% doctool addons addons-napi&set build_addons=1&set build_addons_napi=1"
4749

4850
:next-arg
4951
if "%1"=="" goto args-done
@@ -65,8 +67,8 @@ if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
6567
if /i "%1"=="noetw" set noetw=1&goto arg-ok
6668
if /i "%1"=="noperfctr" set noperfctr=1&goto arg-ok
6769
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
68-
if /i "%1"=="test" set test_args=%test_args% doctool known_issues message parallel sequential addons addons-napi -J&set cpplint=1&set jslint=1&set build_addons=1&set build_addons_napi=1&goto arg-ok
69-
if /i "%1"=="test-ci" set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap doctool inspector known_issues message sequential parallel addons addons-napi&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&set build_addons_napi=1&goto arg-ok
70+
if /i "%1"=="test" set test_args=%test_args% -J %common_test_suites%&set cpplint=1&set jslint=1&goto arg-ok
71+
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
7072
if /i "%1"=="test-addons" set test_args=%test_args% addons&set build_addons=1&goto arg-ok
7173
if /i "%1"=="test-addons-napi" set test_args=%test_args% addons-napi&set build_addons_napi=1&goto arg-ok
7274
if /i "%1"=="test-simple" set test_args=%test_args% sequential parallel -J&goto arg-ok
@@ -76,8 +78,8 @@ if /i "%1"=="test-inspector" set test_args=%test_args% inspector&goto arg-ok
7678
if /i "%1"=="test-tick-processor" set test_args=%test_args% tick-processor&goto arg-ok
7779
if /i "%1"=="test-internet" set test_args=%test_args% internet&goto arg-ok
7880
if /i "%1"=="test-pummel" set test_args=%test_args% pummel&goto arg-ok
79-
if /i "%1"=="test-all" set test_args=%test_args% sequential parallel message gc inspector internet pummel&set build_testgc_addon=1&set cpplint=1&set jslint=1&goto arg-ok
8081
if /i "%1"=="test-known-issues" set test_args=%test_args% known_issues&goto arg-ok
82+
if /i "%1"=="test-all" set test_args=%test_args% gc internet pummel %common_test_suites%&set build_testgc_addon=1&set cpplint=1&set jslint=1&goto arg-ok
8183
if /i "%1"=="test-node-inspect" set test_node_inspect=1&goto arg-ok
8284
if /i "%1"=="test-check-deopts" set test_check_deopts=1&goto arg-ok
8385
if /i "%1"=="jslint" set jslint=1&goto arg-ok
@@ -487,7 +489,7 @@ echo Failed to create vc project files.
487489
goto exit
488490

489491
:help
490-
echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-inspector/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [sign] [x86/x64] [vs2015/vs2017] [download-all] [enable-vtune] [lint/lint-ci] [no-NODE-OPTIONS]
492+
echo vcbuild.bat [debug/release] [msi] [test/test-ci/test-all/test-uv/test-inspector/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/without-intl] [nobuild] [sign] [x86/x64] [vs2015/vs2017] [download-all] [enable-vtune] [lint/lint-ci] [no-NODE-OPTIONS]
491493
echo Examples:
492494
echo vcbuild.bat : builds release build
493495
echo vcbuild.bat debug : builds debug build

0 commit comments

Comments
 (0)