File tree 2 files changed +13
-9
lines changed
2 files changed +13
-9
lines changed Original file line number Diff line number Diff line change 298
298
jstest : build-addons build-js-native-api-tests build-node-api-tests # # Runs addon tests and JS tests
299
299
$(PYTHON ) tools/test.py $(PARALLEL_ARGS ) --mode=$(BUILDTYPE_LOWER ) \
300
300
--skip-tests=$(CI_SKIP_TESTS ) \
301
- $(CI_JS_SUITES ) \
302
- $(CI_NATIVE_SUITES )
301
+ $(JS_SUITES ) \
302
+ $(NATIVE_SUITES )
303
303
304
304
.PHONY : tooltest
305
305
tooltest :
@@ -492,9 +492,11 @@ test-all-valgrind: test-build
492
492
test-all-suites : | clear-stalled test-build bench-addons-build doc-only # # Run all test suites.
493
493
$(PYTHON ) tools/test.py $(PARALLEL_ARGS ) --mode=$(BUILDTYPE_LOWER ) test/*
494
494
495
+ JS_SUITES ?= default
496
+ NATIVE_SUITES ?= addons js-native-api node-api
495
497
# 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
498
500
ifeq ($(node_use_openssl ) , false)
499
501
CI_DOC := doctool
500
502
else
@@ -654,8 +656,8 @@ test-with-async-hooks:
654
656
$(MAKE ) build-node-api-tests
655
657
$(MAKE ) cctest
656
658
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 )
659
661
660
662
661
663
.PHONY : test-v8
Original file line number Diff line number Diff line change @@ -15,12 +15,14 @@ if /i "%1"=="/?" goto help
15
15
16
16
cd %~dp0
17
17
18
+ set JS_SUITES = default
19
+ set NATIVE_SUITES = addons js-native-api node-api
18
20
@ 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"
21
23
set CI_DOC = doctool
22
24
@ 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"
24
26
25
27
@ rem Process arguments.
26
28
set config = Release
You can’t perform that action at this time.
0 commit comments