Skip to content

Commit 1ec53c0

Browse files
committed
build: simplify execution of built binary
Since we aleady have a variable with path to the newly built binary, use that instead of prefixing path. This also allows us to pass a different path through the environment (NODE=) PR-URL: #1955 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Rod Vagg <[email protected]>
1 parent 4b4b176 commit 1ec53c0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Makefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ test-valgrind: all
8787
$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
8888

8989
test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
90-
./$(NODE_EXE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
90+
$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
9191
--directory="$(shell pwd)/test/gc/node_modules/weak" \
9292
--nodedir="$(shell pwd)"
9393

9494
build-addons: $(NODE_EXE)
9595
rm -rf test/addons/doc-*/
96-
./$(NODE_EXE) tools/doc/addon-verify.js
96+
$(NODE) tools/doc/addon-verify.js
9797
$(foreach dir, \
9898
$(sort $(dir $(wildcard test/addons/*/*.gyp))), \
99-
./$(NODE_EXE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
99+
$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
100100
--directory="$(shell pwd)/$(dir)" \
101101
--nodedir="$(shell pwd)" && ) echo "build done"
102102

@@ -141,7 +141,7 @@ test-npm: $(NODE_EXE)
141141
NODE_EXE=$(NODE_EXE) tools/test-npm.sh
142142

143143
test-npm-publish: $(NODE_EXE)
144-
npm_package_config_publishtest=true ./$(NODE_EXE) deps/npm/test/run.js
144+
npm_package_config_publishtest=true $(NODE) deps/npm/test/run.js
145145

146146
test-addons: test-build
147147
$(PYTHON) tools/test.py --mode=release addons
@@ -173,10 +173,10 @@ out/doc/%: doc/%
173173
cp -r $< $@
174174

175175
out/doc/api/%.json: doc/api/%.markdown $(NODE_EXE)
176-
out/Release/$(NODE_EXE) tools/doc/generate.js --format=json $< > $@
176+
$(NODE) tools/doc/generate.js --format=json $< > $@
177177

178178
out/doc/api/%.html: doc/api/%.markdown $(NODE_EXE)
179-
out/Release/$(NODE_EXE) tools/doc/generate.js --format=html --template=doc/template.html $< > $@
179+
$(NODE) tools/doc/generate.js --format=html --template=doc/template.html $< > $@
180180

181181
docopen: out/doc/api/all.html
182182
-google-chrome out/doc/api/all.html
@@ -370,12 +370,12 @@ bench-http-simple:
370370
benchmark/http_simple_bench.sh
371371

372372
bench-idle:
373-
./$(NODE_EXE) benchmark/idle_server.js &
373+
$(NODE) benchmark/idle_server.js &
374374
sleep 1
375-
./$(NODE_EXE) benchmark/idle_clients.js &
375+
$(NODE) benchmark/idle_clients.js &
376376

377377
jslint:
378-
./$(NODE_EXE) tools/eslint/bin/eslint.js src lib test --rulesdir tools/eslint-rules --reset --quiet
378+
$(NODE) tools/eslint/bin/eslint.js src lib test --rulesdir tools/eslint-rules --reset --quiet
379379

380380
CPPLINT_EXCLUDE ?=
381381
CPPLINT_EXCLUDE += src/node_lttng.cc

0 commit comments

Comments
 (0)