diff options
| author | Rich Trott <rtrott@gmail.com> | 2020-07-20 05:18:09 +0300 |
|---|---|---|
| committer | Ruy Adorno <ruyadorno@hotmail.com> | 2020-07-29 18:21:00 +0300 |
| commit | 358b934284c8a8b135626cf9f44ccb0eb593541d (patch) | |
| tree | 90602446d133f71b7f8a461f42b9db1a43e3db0f | |
| parent | 24e1beb829a30fd4182b3a6bb5549590891a2b34 (diff) | |
build: fix test-ci-js task in Makefile
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>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | vcbuild.bat | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -495,8 +495,8 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a JS_SUITES ?= default NATIVE_SUITES ?= addons js-native-api node-api # CI_* variables should be kept synchronized with the ones in vcbuild.bat -CI_NATIVE_SUITES ?= $(NATIVE_SUITES) -CI_JS_SUITES ?= $(JS_SUITES) benchmark +CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark +CI_JS_SUITES ?= $(JS_SUITES) ifeq ($(node_use_openssl), false) CI_DOC := doctool else @@ -507,7 +507,7 @@ endif # Build and test addons without building anything else # Related CI job: node-test-commit-arm-fanned 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 \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ $(TEST_CI_ARGS) $(CI_NATIVE_SUITES) diff --git a/vcbuild.bat b/vcbuild.bat index 99ac46322bb..79214217e5b 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -18,8 +18,8 @@ cd %~dp0 set JS_SUITES=default set NATIVE_SUITES=addons js-native-api node-api @rem CI_* variables should be kept synchronized with the ones in Makefile -set "CI_NATIVE_SUITES=%NATIVE_SUITES%" -set "CI_JS_SUITES=%JS_SUITES% benchmark" +set "CI_NATIVE_SUITES=%NATIVE_SUITES% benchmark" +set "CI_JS_SUITES=%JS_SUITES%" set CI_DOC=doctool @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" |