summaryrefslogtreecommitdiff
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
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>
-rw-r--r--Makefile8
-rw-r--r--test/parallel/test-eslint-alphabetize-errors.js2
-rw-r--r--test/parallel/test-eslint-crypto-check.js2
-rw-r--r--test/parallel/test-eslint-documented-errors.js2
-rw-r--r--test/parallel/test-eslint-duplicate-requires.js2
-rw-r--r--test/parallel/test-eslint-eslint-check.js2
-rw-r--r--test/parallel/test-eslint-inspector-check.js2
-rw-r--r--test/parallel/test-eslint-lowercase-name-for-primitive.js2
-rw-r--r--test/parallel/test-eslint-no-let-in-for-declaration.js2
-rw-r--r--test/parallel/test-eslint-no-unescaped-regexp-dot.js2
-rw-r--r--test/parallel/test-eslint-number-isnan.js2
-rw-r--r--test/parallel/test-eslint-prefer-assert-iferror.js2
-rw-r--r--test/parallel/test-eslint-prefer-assert-methods.js2
-rw-r--r--test/parallel/test-eslint-prefer-common-expectserror.js2
-rw-r--r--test/parallel/test-eslint-prefer-common-mustnotcall.js2
-rw-r--r--test/parallel/test-eslint-prefer-util-format-errors.js2
-rw-r--r--test/parallel/test-eslint-require-buffer.js2
-rw-r--r--test/parallel/test-eslint-required-modules.js2
18 files changed, 40 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"
diff --git a/test/parallel/test-eslint-alphabetize-errors.js b/test/parallel/test-eslint-alphabetize-errors.js
index 3f2a5b3fd3..a9bc26d7f0 100644
--- a/test/parallel/test-eslint-alphabetize-errors.js
+++ b/test/parallel/test-eslint-alphabetize-errors.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
diff --git a/test/parallel/test-eslint-crypto-check.js b/test/parallel/test-eslint-crypto-check.js
index 2325a04354..0a973f4c9c 100644
--- a/test/parallel/test-eslint-crypto-check.js
+++ b/test/parallel/test-eslint-crypto-check.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-documented-errors.js b/test/parallel/test-eslint-documented-errors.js
index 533b829e78..a047ecd358 100644
--- a/test/parallel/test-eslint-documented-errors.js
+++ b/test/parallel/test-eslint-documented-errors.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
diff --git a/test/parallel/test-eslint-duplicate-requires.js b/test/parallel/test-eslint-duplicate-requires.js
index c7edaeed2b..5932fac48e 100644
--- a/test/parallel/test-eslint-duplicate-requires.js
+++ b/test/parallel/test-eslint-duplicate-requires.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-eslint-check.js b/test/parallel/test-eslint-eslint-check.js
index 46e2a6a4a2..c1ee3d501f 100644
--- a/test/parallel/test-eslint-eslint-check.js
+++ b/test/parallel/test-eslint-eslint-check.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-inspector-check.js b/test/parallel/test-eslint-inspector-check.js
index ae71c00402..cf9f60e945 100644
--- a/test/parallel/test-eslint-inspector-check.js
+++ b/test/parallel/test-eslint-inspector-check.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
const RuleTester = require('../../tools/node_modules/eslint').RuleTester;
diff --git a/test/parallel/test-eslint-lowercase-name-for-primitive.js b/test/parallel/test-eslint-lowercase-name-for-primitive.js
index f196f3f45c..11cba8f3f8 100644
--- a/test/parallel/test-eslint-lowercase-name-for-primitive.js
+++ b/test/parallel/test-eslint-lowercase-name-for-primitive.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-no-let-in-for-declaration.js b/test/parallel/test-eslint-no-let-in-for-declaration.js
index ed8f306eea..3afabf72f5 100644
--- a/test/parallel/test-eslint-no-let-in-for-declaration.js
+++ b/test/parallel/test-eslint-no-let-in-for-declaration.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-no-unescaped-regexp-dot.js b/test/parallel/test-eslint-no-unescaped-regexp-dot.js
index e6f09291b0..69600d8073 100644
--- a/test/parallel/test-eslint-no-unescaped-regexp-dot.js
+++ b/test/parallel/test-eslint-no-unescaped-regexp-dot.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-number-isnan.js b/test/parallel/test-eslint-number-isnan.js
index b290a48a89..73359be3bc 100644
--- a/test/parallel/test-eslint-number-isnan.js
+++ b/test/parallel/test-eslint-number-isnan.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-prefer-assert-iferror.js b/test/parallel/test-eslint-prefer-assert-iferror.js
index 7dc3bbe7bc..342459f0b7 100644
--- a/test/parallel/test-eslint-prefer-assert-iferror.js
+++ b/test/parallel/test-eslint-prefer-assert-iferror.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-prefer-assert-methods.js b/test/parallel/test-eslint-prefer-assert-methods.js
index 3ad1cd5c37..a5829cdce3 100644
--- a/test/parallel/test-eslint-prefer-assert-methods.js
+++ b/test/parallel/test-eslint-prefer-assert-methods.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-prefer-common-expectserror.js b/test/parallel/test-eslint-prefer-common-expectserror.js
index e0d208b68b..9829b2adb8 100644
--- a/test/parallel/test-eslint-prefer-common-expectserror.js
+++ b/test/parallel/test-eslint-prefer-common-expectserror.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-prefer-common-mustnotcall.js b/test/parallel/test-eslint-prefer-common-mustnotcall.js
index e6e9d1d2f8..dba244a2a9 100644
--- a/test/parallel/test-eslint-prefer-common-mustnotcall.js
+++ b/test/parallel/test-eslint-prefer-common-mustnotcall.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-prefer-util-format-errors.js b/test/parallel/test-eslint-prefer-util-format-errors.js
index 560222438b..762fec28b1 100644
--- a/test/parallel/test-eslint-prefer-util-format-errors.js
+++ b/test/parallel/test-eslint-prefer-util-format-errors.js
@@ -3,6 +3,8 @@
/* eslint-disable no-template-curly-in-string */
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-require-buffer.js b/test/parallel/test-eslint-require-buffer.js
index d928c43548..e0abd0c2d8 100644
--- a/test/parallel/test-eslint-require-buffer.js
+++ b/test/parallel/test-eslint-require-buffer.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();
diff --git a/test/parallel/test-eslint-required-modules.js b/test/parallel/test-eslint-required-modules.js
index dbdc135ccf..6b2b0d9502 100644
--- a/test/parallel/test-eslint-required-modules.js
+++ b/test/parallel/test-eslint-required-modules.js
@@ -1,6 +1,8 @@
'use strict';
const common = require('../common');
+if (!common.hasCrypto)
+ common.skip('missing crypto');
common.skipIfEslintMissing();