Skip to content

Commit c5d1ec7

Browse files
jbergstroemFishrock123
authored andcommitted
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 PORT-PR-URL: #2101 PORT-FROM: 1ec53c0 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Rod Vagg <[email protected]>
1 parent a971255 commit c5d1ec7

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Makefile

+8-8
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

@@ -153,7 +153,7 @@ test-npm: $(NODE_EXE)
153153
rm -rf npm-cache npm-tmp npm-prefix
154154

155155
test-npm-publish: $(NODE_EXE)
156-
npm_package_config_publishtest=true ./$(NODE_EXE) deps/npm/test/run.js
156+
npm_package_config_publishtest=true $(NODE) deps/npm/test/run.js
157157

158158
test-addons: test-build
159159
$(PYTHON) tools/test.py --mode=release addons
@@ -185,10 +185,10 @@ out/doc/%: doc/%
185185
cp -r $< $@
186186

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

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

193193
docopen: out/doc/api/all.html
194194
-google-chrome out/doc/api/all.html
@@ -382,9 +382,9 @@ bench-http-simple:
382382
benchmark/http_simple_bench.sh
383383

384384
bench-idle:
385-
./$(NODE_EXE) benchmark/idle_server.js &
385+
$(NODE) benchmark/idle_server.js &
386386
sleep 1
387-
./$(NODE_EXE) benchmark/idle_clients.js &
387+
$(NODE) benchmark/idle_clients.js &
388388

389389
jslintfix:
390390
PYTHONPATH=tools/closure_linter/:tools/gflags/ $(PYTHON) tools/closure_linter/closure_linter/fixjsstyle.py --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js

0 commit comments

Comments
 (0)