Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e7252df

Browse filesBrowse files
Trottaddaleax
authored andcommitted
build: fix test-ci-js task in Makefile
Move benchmark CI to native suite since it requires building an addon. Refs: #34427 (comment) PR-URL: #34433 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
1 parent 833474f commit e7252df
Copy full SHA for e7252df

File tree

Expand file treeCollapse file tree

2 files changed

+5
-5
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+5
-5
lines changed
Open diff view settings
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,8 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
492492
JS_SUITES ?= default
493493
NATIVE_SUITES ?= addons js-native-api node-api
494494
# CI_* variables should be kept synchronized with the ones in vcbuild.bat
495-
CI_NATIVE_SUITES ?= $(NATIVE_SUITES)
496-
CI_JS_SUITES ?= $(JS_SUITES) benchmark
495+
CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark
496+
CI_JS_SUITES ?= $(JS_SUITES)
497497
ifeq ($(node_use_openssl), false)
498498
CI_DOC := doctool
499499
else
@@ -504,7 +504,7 @@ endif
504504
# Build and test addons without building anything else
505505
# Related CI job: node-test-commit-arm-fanned
506506
test-ci-native: LOGLEVEL := info
507-
test-ci-native: | test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
507+
test-ci-native: | benchmark/napi/.buildstamp test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
508508
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
509509
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
510510
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
Collapse file

‎vcbuild.bat‎

Copy file name to clipboardExpand all lines: vcbuild.bat
+2-2Lines changed: 2 additions & 2 deletions
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.