1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: use BUILDTYPE in bench-addons-build targets

Browse Source 
This commit uses the BUILDTYPE for the benchmark targets that currently
explicitly use Release as the build type.

The motivation for this change is allows switching between debug builds
and release builds using the bench-addons-clean/bench-addons-build
targets.

PR-URL: https://github.com/nodejs/node/pull/24033
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Daniel Bevenius 2018-11-02 07:53:57 +01:00 committed by Refael Ackermann
parent 288076d4a5
commit ce6ec368a6
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -308,7 +308,7 @@ test-valgrind: all
test-check-deopts: all
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) --check-deopts parallel sequential
benchmark/napi/function_call/build/Release/binding.node: \
benchmark/napi/function_call/build/$(BUILDTYPE)/binding.node: \
benchmark/napi/function_call/napi_binding.c \
benchmark/napi/function_call/binding.cc \
benchmark/napi/function_call/binding.gyp | all
@ -317,7 +317,7 @@ benchmark/napi/function_call/build/Release/binding.node: \
--directory="$(shell pwd)/benchmark/napi/function_call" \
--nodedir="$(shell pwd)"
benchmark/napi/function_args/build/Release/binding.node: \
benchmark/napi/function_args/build/$(BUILDTYPE)/binding.node: \
benchmark/napi/function_args/napi_binding.c \
benchmark/napi/function_args/binding.cc \
benchmark/napi/function_args/binding.gyp | all
@ -1050,8 +1050,8 @@ bench: bench-addons-build
# Build required addons for benchmark before running it.
.PHONY: bench-addons-build
bench-addons-build: benchmark/napi/function_call/build/Release/binding.node \
benchmark/napi/function_args/build/Release/binding.node
bench-addons-build: benchmark/napi/function_call/build/$(BUILDTYPE)/binding.node \
benchmark/napi/function_args/build/$(BUILDTYPE)/binding.node
.PHONY: bench-addons-clean
bench-addons-clean:

2
benchmark/common.js
View File

@ -3,6 +3,8 @@
const child_process = require('child_process');
const http_benchmarkers = require('./_http-benchmarkers.js');
exports.buildType = process.features.debug ? 'Debug' : 'Release';
exports.createBenchmark = function(fn, configs, options) {
return new Benchmark(fn, configs, options);
};

4
benchmark/napi/function_args/index.js
View File

@ -10,14 +10,14 @@ let v8;
let napi;
try {
v8 = require('./build/Release/binding');
v8 = require(`./build/${common.buildType}/binding`);
} catch {
console.error(`${__filename}: V8 Binding failed to load`);
process.exit(0);
}
try {
napi = require('./build/Release/napi_binding');
napi = require(`./build/${common.buildType}/napi_binding`);
} catch {
console.error(`${__filename}: NAPI-Binding failed to load`);
process.exit(0);

4
benchmark/napi/function_call/index.js
View File

@ -12,7 +12,7 @@ const common = require('../../common.js');
// abort quietly.
try {
var binding = require('./build/Release/binding');
var binding = require(`./build/${common.buildType}/binding`);
} catch {
console.error('misc/function_call.js Binding failed to load');
process.exit(0);
@ -21,7 +21,7 @@ const cxx = binding.hello;
let napi_binding;
try {
napi_binding = require('./build/Release/napi_binding');
napi_binding = require(`./build/${common.buildType}/napi_binding`);
} catch {
console.error('misc/function_call/index.js NAPI-Binding failed to load');
process.exit(0);