OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2025-12-06 12:20:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

build: fix test-ci-js task in Makefile

Browse Source 
Move benchmark CI to native suite since it requires building an addon.

Refs: https://github.com/nodejs/node/issues/34427#issuecomment-660760789

PR-URL: https://github.com/nodejs/node/pull/34433
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
Rich Trott 2020-07-19 19:18:09 -07:00 committed by Anna Henningsen
parent 833474f844
commit e7252df0b9
No known key found for this signature in database
GPG Key ID: A94130F0BFC8EBE9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -492,8 +492,8 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
JS_SUITES ?= default JS_SUITES ?= default
NATIVE_SUITES ?= addons js-native-api node-api NATIVE_SUITES ?= addons js-native-api node-api
# CI_* variables should be kept synchronized with the ones in vcbuild.bat # CI_* variables should be kept synchronized with the ones in vcbuild.bat
CI_NATIVE_SUITES ?= $(NATIVE_SUITES) CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark
CI_JS_SUITES ?= $(JS_SUITES) benchmark CI_JS_SUITES ?= $(JS_SUITES)
ifeq ($(node_use_openssl), false) ifeq ($(node_use_openssl), false)
CI_DOC := doctool CI_DOC := doctool
else else
@ -504,7 +504,7 @@ endif
# Build and test addons without building anything else # Build and test addons without building anything else
# Related CI job: node-test-commit-arm-fanned # Related CI job: node-test-commit-arm-fanned
test-ci-native: LOGLEVEL := info test-ci-native: LOGLEVEL := info
test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp test-ci-native: | benchmark/napi/.buildstamp test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES) $(TEST_CI_ARGS) $(CI_NATIVE_SUITES)

4
vcbuild.bat
View File

@ -18,8 +18,8 @@ cd %~dp0
set JS_SUITES=default set JS_SUITES=default
set NATIVE_SUITES=addons js-native-api node-api set NATIVE_SUITES=addons js-native-api node-api
@rem CI_* variables should be kept synchronized with the ones in Makefile @rem CI_* variables should be kept synchronized with the ones in Makefile
set "CI_NATIVE_SUITES=%NATIVE_SUITES%" set "CI_NATIVE_SUITES=%NATIVE_SUITES% benchmark"
set "CI_JS_SUITES=%JS_SUITES% benchmark" set "CI_JS_SUITES=%JS_SUITES%"
set CI_DOC=doctool set CI_DOC=doctool
@rem Same as the test-ci target in Makefile @rem Same as the test-ci target in Makefile
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" 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"