Skip to content

Commit 41c1e72

Browse files
committed
build: fix test-ci-js task in Makefile
Move benchmark CI to native suite since it requires building an addon. Refs: nodejs#34427 (comment) PR-URL: nodejs#34433 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
1 parent 2c30920 commit 41c1e72

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,8 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
495495
JS_SUITES ?= default
496496
NATIVE_SUITES ?= addons js-native-api node-api
497497
# CI_* variables should be kept synchronized with the ones in vcbuild.bat
498-
CI_NATIVE_SUITES ?= $(NATIVE_SUITES)
499-
CI_JS_SUITES ?= $(JS_SUITES) benchmark
498+
CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark
499+
CI_JS_SUITES ?= $(JS_SUITES)
500500
ifeq ($(node_use_openssl), false)
501501
CI_DOC := doctool
502502
else
@@ -507,7 +507,7 @@ endif
507507
# Build and test addons without building anything else
508508
# Related CI job: node-test-commit-arm-fanned
509509
test-ci-native: LOGLEVEL := info
510-
test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
510+
test-ci-native: | benchmark/napi/.buildstamp test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
511511
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
512512
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
513513
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)

vcbuild.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ cd %~dp0
1818
set JS_SUITES=default
1919
set NATIVE_SUITES=addons js-native-api node-api
2020
@rem CI_* variables should be kept synchronized with the ones in Makefile
21-
set "CI_NATIVE_SUITES=%NATIVE_SUITES%"
22-
set "CI_JS_SUITES=%JS_SUITES% benchmark"
21+
set "CI_NATIVE_SUITES=%NATIVE_SUITES% benchmark"
22+
set "CI_JS_SUITES=%JS_SUITES%"
2323
set CI_DOC=doctool
2424
@rem Same as the test-ci target in Makefile
2525
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"

0 commit comments

Comments
 (0)