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 295295jstest : build-addons build-js-native-api-tests build-node-api-tests # # Runs addon tests and JS tests
296296 $(PYTHON ) tools/test.py $(PARALLEL_ARGS ) --mode=$(BUILDTYPE_LOWER ) \
297297 --skip-tests=$(CI_SKIP_TESTS ) \
298- $(CI_JS_SUITES ) \
299- $(CI_NATIVE_SUITES )
298+ $(JS_SUITES ) \
299+ $(NATIVE_SUITES )
300300
301301.PHONY : tooltest
302302tooltest :
@@ -489,9 +489,11 @@ test-all-valgrind: test-build
489489test-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+ JS_SUITES ?= default
493+ NATIVE_SUITES ?= addons js-native-api node-api
492494# CI_* variables should be kept synchronized with the ones in vcbuild.bat
493- CI_NATIVE_SUITES ?= addons js-native-api node-api
494- CI_JS_SUITES ?= default benchmark
495+ CI_NATIVE_SUITES ?= $( NATIVE_SUITES )
496+ CI_JS_SUITES ?= $( JS_SUITES ) benchmark
495497ifeq ($(node_use_openssl ) , false)
496498 CI_DOC := doctool
497499else
@@ -650,8 +652,8 @@ test-with-async-hooks:
650652 $(MAKE ) build-node-api-tests
651653 $(MAKE ) cctest
652654 NODE_TEST_WITH_ASYNC_HOOKS=1 $(PYTHON ) tools/test.py $(PARALLEL_ARGS ) --mode=$(BUILDTYPE_LOWER ) \
653- $(CI_JS_SUITES ) \
654- $(CI_NATIVE_SUITES )
655+ $(JS_SUITES ) \
656+ $(NATIVE_SUITES )
655657
656658
657659.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