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 a1adce1

Browse filesBrowse files
richardlautargos
authored andcommitted
build: build benchmark addons like test addons
Build the addons for benchmarks in the same way that the addons for tests are built. PR-URL: #29995 Fixes: nodejs/build#1961 Refs: 53ca0b9#commitcomment-35494896 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
1 parent 94ac44f commit a1adce1
Copy full SHA for a1adce1

File tree

Expand file treeCollapse file tree

2 files changed

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

2 files changed

+15
-22
lines changed
Open diff view settings
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+14-22Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -347,24 +347,6 @@ test-valgrind: all
347347
test-check-deopts: all
348348
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --check-deopts parallel sequential
349349

350-
benchmark/napi/function_call/build/$(BUILDTYPE)/binding.node: \
351-
benchmark/napi/function_call/napi_binding.c \
352-
benchmark/napi/function_call/binding.cc \
353-
benchmark/napi/function_call/binding.gyp | all
354-
$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
355-
--python="$(PYTHON)" \
356-
--directory="$(shell pwd)/benchmark/napi/function_call" \
357-
--nodedir="$(shell pwd)"
358-
359-
benchmark/napi/function_args/build/$(BUILDTYPE)/binding.node: \
360-
benchmark/napi/function_args/napi_binding.c \
361-
benchmark/napi/function_args/binding.cc \
362-
benchmark/napi/function_args/binding.gyp | all
363-
$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
364-
--python="$(PYTHON)" \
365-
--directory="$(shell pwd)/benchmark/napi/function_args" \
366-
--nodedir="$(shell pwd)"
367-
368350
DOCBUILDSTAMP_PREREQS = tools/doc/addon-verify.js doc/api/addons.md
369351

370352
ifeq ($(OSTYPE),aix)
@@ -470,6 +452,17 @@ test/node-api/.buildstamp: $(ADDONS_PREREQS) \
470452
# TODO(bnoordhuis) Force rebuild after gyp or node-gyp update.
471453
build-node-api-tests: | $(NODE_EXE) test/node-api/.buildstamp
472454

455+
BENCHMARK_NAPI_BINDING_GYPS := $(wildcard benchmark/napi/*/binding.gyp)
456+
457+
BENCHMARK_NAPI_BINDING_SOURCES := \
458+
$(wildcard benchmark/napi/*/*.c) \
459+
$(wildcard benchmark/napi/*/*.cc) \
460+
$(wildcard benchmark/napi/*/*.h)
461+
462+
benchmark/napi/.buildstamp: $(ADDONS_PREREQS) \
463+
$(BENCHMARK_NAPI_BINDING_GYPS) $(BENCHMARK_NAPI_BINDING_SOURCES)
464+
@$(call run_build_addons,"$$PWD/benchmark/napi",$@)
465+
473466
.PHONY: clear-stalled
474467
clear-stalled:
475468
@echo "Clean up any leftover processes but don't error if found."
@@ -1163,13 +1156,12 @@ bench: bench-addons-build
11631156

11641157
# Build required addons for benchmark before running it.
11651158
.PHONY: bench-addons-build
1166-
bench-addons-build: benchmark/napi/function_call/build/$(BUILDTYPE)/binding.node \
1167-
benchmark/napi/function_args/build/$(BUILDTYPE)/binding.node
1159+
bench-addons-build: | $(NODE_EXE) benchmark/napi/.buildstamp
11681160

11691161
.PHONY: bench-addons-clean
11701162
bench-addons-clean:
1171-
$(RM) -r benchmark/napi/function_call/build
1172-
$(RM) -r benchmark/napi/function_args/build
1163+
$(RM) -r benchmark/napi/*/build
1164+
$(RM) benchmark/napi/.buildstamp
11731165

11741166
.PHONY: lint-md-rollup
11751167
lint-md-rollup:
Collapse file

‎benchmark/napi/ref/.gitignore‎

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build/

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.