File tree Expand file tree Collapse file tree 2 files changed +13
-9
lines changed Expand file tree Collapse file tree 2 files changed +13
-9
lines changed Original file line number Diff line number Diff line change 298298jstest : build-addons build-js-native-api-tests build-node-api-tests # # Runs addon tests and JS tests
299299 $(PYTHON ) tools/test.py $(PARALLEL_ARGS ) --mode=$(BUILDTYPE_LOWER ) \
300300 --skip-tests=$(CI_SKIP_TESTS ) \
301- $(CI_JS_SUITES ) \
302- $(CI_NATIVE_SUITES )
301+ $(JS_SUITES ) \
302+ $(NATIVE_SUITES )
303303
304304.PHONY : tooltest
305305tooltest :
@@ -492,9 +492,11 @@ test-all-valgrind: test-build
492492test-all-suites : | clear-stalled test-build bench-addons-build doc-only # # Run all test suites.
493493 $(PYTHON ) tools/test.py $(PARALLEL_ARGS ) --mode=$(BUILDTYPE_LOWER ) test/*
494494
495+ JS_SUITES ?= default
496+ NATIVE_SUITES ?= addons js-native-api node-api
495497# CI_* variables should be kept synchronized with the ones in vcbuild.bat
496- CI_NATIVE_SUITES ?= addons js-native-api node-api
497- CI_JS_SUITES ?= default benchmark
498+ CI_NATIVE_SUITES ?= $( NATIVE_SUITES )
499+ CI_JS_SUITES ?= $( JS_SUITES ) benchmark
498500ifeq ($(node_use_openssl ) , false)
499501 CI_DOC := doctool
500502else
@@ -654,8 +656,8 @@ test-with-async-hooks:
654656 $(MAKE ) build-node-api-tests
655657 $(MAKE ) cctest
656658 NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON ) tools/test.py $(PARALLEL_ARGS ) --mode=$(BUILDTYPE_LOWER ) \
657- $(CI_JS_SUITES ) \
658- $(CI_NATIVE_SUITES )
659+ $(JS_SUITES ) \
660+ $(NATIVE_SUITES )
659661
660662
661663.PHONY : test-v8
Original file line number Diff line number Diff line change @@ -15,12 +15,14 @@ if /i "%1"=="/?" goto help
1515
1616cd %~dp0
1717
18+ set JS_SUITES = default
19+ set NATIVE_SUITES = addons js-native-api node-api
1820@ 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 benchmark
21+ set " CI_NATIVE_SUITES = %NATIVE_SUITES% "
22+ set " CI_JS_SUITES = %JS_SUITES% benchmark"
2123set CI_DOC = doctool
2224@ 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"
25+ set " common_test_suites = %JS_SUITES % %NATIVE_SUITES % &set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1"
2426
2527@ rem Process arguments.
2628set config = Release
You can’t perform that action at this time.
0 commit comments