summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2019-02-18 13:20:58 +0100
committerDaniel Bevenius <daniel.bevenius@gmail.com>2019-02-21 05:35:12 +0100
commitf17f4675440270d03b138d8ce55c1345230f6d2a (patch)
tree777c624e3cb042edeeeec0362ec530183dd9d837 /Makefile
parent85df2c4703242679e409f648de95843f4a1f69a7 (diff)
downloadandroid-node-v8-f17f4675440270d03b138d8ce55c1345230f6d2a.tar.gz
android-node-v8-f17f4675440270d03b138d8ce55c1345230f6d2a.tar.bz2
android-node-v8-f17f4675440270d03b138d8ce55c1345230f6d2a.zip
build,test: guard eslint with crypto check
Currently, configuring --without-ssl will cause the lint-js target to fail with the following error: $ make lint-js Running JS linter... internal/util.js:101 throw new ERR_NO_CRYPTO(); ^ Error [ERR_NO_CRYPTO]: Node.js is not compiled with OpenSSL crypto support at assertCrypto (internal/util.js:101:11) at crypto.js:31:1 ... (/node/tools/node_modules/eslint/node_modules/file-entry-cache/ cache.js:2:14) at Module._compile (internal/modules/cjs/loader.js:746:30) at Object.Module._extensions..js (internal/modules/cjs/loader.js:757:10) make: *** [lint-js] Error 1 There are also a number of tests that are affected in a similar way. This commit adds crypto checks to allow for lint-js and the affected tests to be skipped when configured --without-ssl. PR-URL: https://github.com/nodejs/node/pull/26182 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c3c9bdf6f7..3d8ef4dc57 100644
--- a/Makefile
+++ b/Makefile
@@ -1184,8 +1184,12 @@ lint-js-fix:
# Note that on the CI `lint-js-ci` is run instead.
# Lints the JavaScript code with eslint.
lint-js:
- @echo "Running JS linter..."
- @$(call available-node,$(run-lint-js))
+ @if [ "$(shell $(node_use_openssl))" != "true" ]; then \
+ echo "Skipping $@ (no crypto)"; \
+ else \
+ echo "Running JS linter..."; \
+ $(call available-node,$(run-lint-js)) \
+ fi
jslint: lint-js
@echo "Please use lint-js instead of jslint"